diff --git a/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditSchoolController.java b/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditSchoolController.java index d717cf6..5d2a391 100644 --- a/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditSchoolController.java +++ b/src/main/java/io/v/nutz/reimbursementPreAudit/controller/preAuditSchoolController.java @@ -17,6 +17,7 @@ import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; /** * @ClassName preAuditController @@ -40,7 +41,7 @@ public class preAuditSchoolController { @At @ViReturn @RequiresPermissions("reimbursementPreAudit.audit") - public Object pageData(PageForm pageForm, String year, String notes, Integer auditState,String unitId,String unionId) { + public Object pageData(PageForm pageForm, String year, String notes, Integer auditState, String unitId, String unionId) { Cnd cnd = Cnd.NEW(); Sql sql = Sqls.create(""" SELECT * FROM `reimbursement_pre_audit` $condition @@ -71,10 +72,18 @@ public class preAuditSchoolController { @ViReturn @SLog(tag = "报销预审", msg = "审核一条记录", param = true, result = true) @RequiresPermissions("reimbursementPreAudit.audit") - public Object doSubmit(Audit audit, String id, Boolean flag) { + public Object doSubmit(Audit audit, String id, @Param("flag") Integer flag) { audit.setLoginname(ShiroUtil.getPrincipalProperty("loginname").toString()); baseService.insert(audit); - Chain chain = Chain.make("auditId", audit.getId()).add("auditState", flag ? 3 : 2); + Integer auditState; + if (flag == 1) { + auditState = 2; + } else if (flag == 2) { + auditState = 3; + } else { + auditState = 4; + } + Chain chain = Chain.make("auditId", audit.getId()).add("auditState", auditState); baseService.dao().update(ReimbursementPreAudit.class, chain, Cnd.where("id", "=", id)); return null; } diff --git a/src/main/java/io/v/nutz/reimbursementPreAudit/models/ReimbursementPreAudit.java b/src/main/java/io/v/nutz/reimbursementPreAudit/models/ReimbursementPreAudit.java index 48632f1..6786624 100644 --- a/src/main/java/io/v/nutz/reimbursementPreAudit/models/ReimbursementPreAudit.java +++ b/src/main/java/io/v/nutz/reimbursementPreAudit/models/ReimbursementPreAudit.java @@ -67,6 +67,11 @@ public class ReimbursementPreAudit extends BaseModel { @ColDefine(type = ColType.VARCHAR, width = 100) private String notes; + @Column + @Comment("联系电话") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String mobile; + @Column @Comment("申报时间") @ColDefine(type = ColType.VARCHAR, width = 32) diff --git a/src/main/resources/views/platform/reimbursementPreAudit/audit.html b/src/main/resources/views/platform/reimbursementPreAudit/audit.html index d1b45b2..5e9a36f 100644 --- a/src/main/resources/views/platform/reimbursementPreAudit/audit.html +++ b/src/main/resources/views/platform/reimbursementPreAudit/audit.html @@ -16,10 +16,10 @@ layout("/layouts/platform.html"){