diff --git a/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationApplyController.java b/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationApplyController.java index 770370e..036f5ae 100644 --- a/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationApplyController.java +++ b/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationApplyController.java @@ -40,7 +40,7 @@ public class WakesHomeDeclarationApplyController { @ViReturn @RequiresPermissions("wakeshome.declaration.apply") public Object doSave(WakesHomeApply wakesHomeApply) { - wakesHomeApply.setState("10000"); + wakesHomeApply.setState("10020"); if (wakesHomeApply != null) { if (StrUtil.isNotBlank(wakesHomeApply.getId())) { wakesHomeApplyService.update(wakesHomeApply); @@ -57,7 +57,7 @@ public class WakesHomeDeclarationApplyController { @ViReturn @RequiresPermissions("wakeshome.declaration.apply") public Object doSubmit(WakesHomeApply wakesHomeApply) { - wakesHomeApply.setState("10010"); + wakesHomeApply.setState("10020"); if (wakesHomeApply != null) { if (StrUtil.isNotBlank(wakesHomeApply.getId())) { wakesHomeApplyService.update(wakesHomeApply); diff --git a/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationMineController.java b/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationMineController.java index 368e00a..a3041f1 100644 --- a/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationMineController.java +++ b/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationMineController.java @@ -23,6 +23,7 @@ import org.nutz.dao.sql.Sql; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; @@ -124,13 +125,19 @@ public class WakesHomeDeclarationMineController { map.put("basicInformation", nutMap.getString("basicInformation")); map.put("constructionPlan", nutMap.getString("constructionPlan")); NutMap schoolAudit = nutMap.getAs("schoolAudit", NutMap.class); + if (Lang.isNotEmpty(schoolAudit)){ + schoolAudit.setv("auditTime", DateUtil.formatDate(schoolAudit.getTime("auditTime"))); + schoolAudit.setv("auditSign", Vi.getImg(schoolAudit.getString("auditSign"))); + map.put("schoolAudit", schoolAudit); + } NutMap organizationAudit = nutMap.getAs("organizationAudit", NutMap.class); - schoolAudit.setv("auditTime", DateUtil.formatDate(schoolAudit.getTime("auditTime"))); - schoolAudit.setv("auditSign", Vi.getImg(schoolAudit.getString("auditSign"))); - organizationAudit.setv("auditTime", DateUtil.formatDate(organizationAudit.getTime("auditTime"))); - organizationAudit.setv("auditSign", Vi.getImg(organizationAudit.getString("auditSign"))); - map.put("organizationAudit", organizationAudit); - map.put("schoolAudit", schoolAudit); + if (Lang.isNotEmpty(organizationAudit)){ + organizationAudit.setv("auditTime", DateUtil.formatDate(organizationAudit.getTime("auditTime"))); + organizationAudit.setv("auditSign", Vi.getImg(organizationAudit.getString("auditSign"))); + map.put("organizationAudit", organizationAudit); + } + + response.addHeader("Content-Type", "application/octet-stream"); diff --git a/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationSchoolController.java b/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationSchoolController.java index c173c83..02c7516 100644 --- a/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationSchoolController.java +++ b/src/main/java/io/v/nutz/wakershome/controller/declaration/WakesHomeDeclarationSchoolController.java @@ -5,6 +5,7 @@ import io.v.nutz.base.utils.Vi; import io.v.nutz.dao.CndPlus; import io.v.nutz.modules.models.Audit; import io.v.nutz.modules.models.PageForm; +import io.v.nutz.sys.models.Sys_file; import io.v.nutz.util.ShiroUtil; import io.v.nutz.wakershome.model.WakesHomeApply; import io.v.nutz.wakershome.service.IWakesHomeApplyService; @@ -17,10 +18,13 @@ import org.nutz.dao.sql.Sql; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.json.Json; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; +import java.util.List; + /** * @version 1.0 * @Author zzr @@ -39,7 +43,8 @@ public class WakesHomeDeclarationSchoolController { @At("") @Ok("beetl:/platform/wakeshome/declaration/schoolAudit.html") @RequiresPermissions("wakeshome.declaration.school") - public void index() {} + public void index() { + } @At @@ -48,7 +53,7 @@ public class WakesHomeDeclarationSchoolController { public Object pageData(PageForm pageForm, @Param(value = "year", required = false) Integer year, @Param(value = "unionId", required = false) String unionId, - @Param(value = "isAudit", required = false) String isAudit){ + @Param(value = "isAudit", required = false) String isAudit) { Sql sql = Sqls.create(""" SELECT wh.*, @@ -89,10 +94,21 @@ public class WakesHomeDeclarationSchoolController { @ViReturn @Aop(TransAop.READ_COMMITTED) @RequiresPermissions("wakeshome.declaration.school") - public Object doRollBack(String id){ + public Object doRollBack(String id) { WakesHomeApply wakesHome = wakesHomeApplyService.fetch(id); - wakesHomeApplyService.dao().clear(Audit.class,Cnd.where("id","=",wakesHome.getSchoolAuditId())); - wakesHomeApplyService.update(Chain.make("state",10020).add("schoolAuditId",null),Cnd.where("id","=",id)); + wakesHomeApplyService.dao().clear(Audit.class, Cnd.where("id", "=", wakesHome.getSchoolAuditId())); + wakesHomeApplyService.update(Chain.make("state", 10020).add("schoolAuditId", null), Cnd.where("id", "=", id)); + return null; + } + + @At + @ViReturn + @RequiresPermissions("wakeshome.declaration.school") + public Object doFiles(String id, String files) { + WakesHomeApply wakesHomeApply = new WakesHomeApply(); + wakesHomeApply.setId(id); + wakesHomeApply.setFiles(Json.fromJsonAsList(Sys_file.class, files)); + wakesHomeApplyService.updateIgnoreNull(wakesHomeApply); return null; } } diff --git a/src/main/resources/static/components/wakeshome/declaration/WakesHomeInfoApply.vue b/src/main/resources/static/components/wakeshome/declaration/WakesHomeInfoApply.vue index ef9b80e..980b87c 100644 --- a/src/main/resources/static/components/wakeshome/declaration/WakesHomeInfoApply.vue +++ b/src/main/resources/static/components/wakeshome/declaration/WakesHomeInfoApply.vue @@ -34,6 +34,16 @@
+ + + 党组织盖章文档 + + + 暂无 + + diff --git a/src/main/resources/views/platform/wakeshome/declaration/apply.html b/src/main/resources/views/platform/wakeshome/declaration/apply.html index f76ff7d..dca8acd 100644 --- a/src/main/resources/views/platform/wakeshome/declaration/apply.html +++ b/src/main/resources/views/platform/wakeshome/declaration/apply.html @@ -114,14 +114,7 @@ layout("/layouts/platform.html"){ - - - - -
请上传党组织盖章文档
-
+ diff --git a/src/main/resources/views/platform/wakeshome/declaration/mine.html b/src/main/resources/views/platform/wakeshome/declaration/mine.html index 0380d4c..a7d0703 100644 --- a/src/main/resources/views/platform/wakeshome/declaration/mine.html +++ b/src/main/resources/views/platform/wakeshome/declaration/mine.html @@ -76,7 +76,7 @@ layout("/layouts/platform.html"){ 申报表导出 + v-if="row.state">申报表导出 年度:
+ type="year" + v-model="pageForm.year" + value-format="yyyy">
所属工会:
- - + v-model="pageForm.unionId"> +
- 搜索 + 搜索
- - + + - - + + - + @@ -96,42 +111,60 @@ layout("/layouts/platform.html"){ + + + + + + 关 闭 + 确 定 + + +