报销功能修改流程和页面修改

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementService.java

@@ -282,12 +282,18 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                         ""
                 );
         List<User> users = new ArrayList<>();
+        //部门主任
         List<User> bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"8",workReimbursement.getCreateBy());
-        List<User> fglds = UserUtils.getByRoleActivityEnname("fgld",2,office.getId(),"8",workReimbursement.getCreateBy());
+        //分管领导
+        //List<User> fglds = UserUtils.getByRoleActivityEnname("fgld",2,office.getId(),"8",workReimbursement.getCreateBy());
+        //财务主任
         List<User> cws = UserUtils.getByRoleActivityEnname("cwzg",3,office.getId(),"8",workReimbursement.getCreateBy());
+        //总经理
         List<User> zjls = UserUtils.getByRoleActivityEnname("zjl",3,office.getId(),"8",workReimbursement.getCreateBy());
-        List<User> cwzjs = UserUtils.getByRoleActivityEnname("cwfgld",3,office.getId(),"8",workReimbursement.getCreateBy());
-        List<User> cns = UserUtils.getByRoleActivityEnname("cn",3,office.getId(),"8",workReimbursement.getCreateBy());
+        //财务分管领导
+        //List<User> cwzjs = UserUtils.getByRoleActivityEnname("cwfgld",3,office.getId(),"8",workReimbursement.getCreateBy());
+        //出纳
+        //List<User> cns = UserUtils.getByRoleActivityEnname("cn",3,office.getId(),"8",workReimbursement.getCreateBy());
         if (StringUtils.isNotBlank(workActivityMenu.getId())) {
             workProjectNotify.setNotifyRole("");
             workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());
@@ -369,7 +375,8 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
             variables.put("cncount",cns.size());*/
             variables.put("bmzrcount",bmzrs.size());
             variables.put("bmzrList",bmzrs);
-            processType = "reimbursement";
+            //processType = "reimbursement";
+            processType = "newReimbursement";
             users.addAll(bmzrs);
         }
         for (User u : users){
@@ -411,7 +418,8 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
             workActivityProcessService.saveList(list, processInstance.getId());
         } else {
             WorkActivityProcess workActivityProcess = new WorkActivityProcess();
-            workActivityProcess.setProcessKey("reimbursement");
+            //workActivityProcess.setProcessKey("reimbursement");
+            workActivityProcess.setProcessKey("newReimbursement");
             workActivityProcess.setCount(1);
             workActivityProcess.setProcessInstanceId(processInstance.getId());
             workActivityProcess.setIsApproval("0");
@@ -421,7 +429,7 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
             workActivityProcessService.save(workActivityProcess);
             workActivityProcess.setCount(3);
             workActivityProcess.setId("");
-            workActivityProcessService.save(workActivityProcess);
+            /*workActivityProcessService.save(workActivityProcess);
             workActivityProcess.setCount(4);
             workActivityProcess.setId("");
             workActivityProcessService.save(workActivityProcess);
@@ -429,14 +437,14 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
             workActivityProcess.setId("");
             workActivityProcessService.save(workActivityProcess);
             workActivityProcess.setCount(6);
-            workActivityProcess.setId("");
+            workActivityProcess.setId("");*/
             workActivityProcessService.save(workActivityProcess);
             workActivityProcessService.insertAuditsByType(bmzrs,processInstance.getId(),1,1);
-            workActivityProcessService.insertAuditsByType(fglds,processInstance.getId(),2,0);
-            workActivityProcessService.insertAuditsByType(cws,processInstance.getId(),3,0);
-            workActivityProcessService.insertAuditsByType(zjls,processInstance.getId(),4,0);
-            workActivityProcessService.insertAuditsByType(cwzjs,processInstance.getId(),5,0);
-            workActivityProcessService.insertAuditsByType(cns,processInstance.getId(),6,0);
+            //workActivityProcessService.insertAuditsByType(fglds,processInstance.getId(),2,0);
+            workActivityProcessService.insertAuditsByType(cws,processInstance.getId(),2,0);
+            workActivityProcessService.insertAuditsByType(zjls,processInstance.getId(),3,0);
+            //workActivityProcessService.insertAuditsByType(cwzjs,processInstance.getId(),5,0);
+            //workActivityProcessService.insertAuditsByType(cns,processInstance.getId(),6,0);
         }
         logger.debug("start process of {key={}, bkey={}, pid={}, variables={}}", new Object[]{
                 ActUtils.PD_REIMBURSEMENT[0], businessKey, processInstance.getId(), variables});
@@ -643,7 +651,8 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
         selectProcess.setProcessInstanceId(workReimbursement.getProcessInstanceId());
         List<WorkActivityProcess> workActivityProcesses = workActivityProcessService.findList(selectProcess);
         List<Activity> activities = workActivityMenu.getActivities();
-        if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("reimbursement")) {
+        //if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("reimbursement")) {
+        if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("newReimbursement")) {
             key = 1;
             for (int i = 0; i < workActivityProcesses.size(); i++) {
                 WorkActivityProcess activityProcess = workActivityProcesses.get(i);
@@ -688,7 +697,8 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                 }
             }
         } else {
-            workActivityMenu.setProcessType("reimbursement");
+            //workActivityMenu.setProcessType("reimbursement");
+            workActivityMenu.setProcessType("newReimbursement");
             for (int i = 0; i < workActivityProcesses.size(); i++) {
                 WorkActivityProcess activityProcess = workActivityProcesses.get(i);
                 String count = activityProcess.getCount() + "";
@@ -700,19 +710,31 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                 if ("bmzr".equals(taskDefKey) && count.contains("1")) {
                     taskCount = "1";
                     exp = "pass";
-                    if ("yes".equals(workReimbursement.getAct().getFlag())) {
+                    /*if ("yes".equals(workReimbursement.getAct().getFlag())) {
                         workActivityProcessService.insertAuditsByType(auditUsers,workReimbursement.getProcessInstanceId(),2,1);
                         workActivityProcess.setIsApproval("1");
                         notifyRole = "分管领导审核";
+                        notifyRole = "分管领导审核";
                         enname = "fgld";
                         vars.put("fgldList", auditUsers);
                         vars.put("fgldcount",auditUsers.size());
                     } else {
                         notifyRole = "调整申请";
                         workActivityProcess.setIsApproval("2");
+                    }*/
+                    if ("yes".equals(workReimbursement.getAct().getFlag())) {
+                        workActivityProcessService.insertAuditsByType(auditUsers,workReimbursement.getProcessInstanceId(),2,1);
+                        notifyRole = "财务审核";
+                        workActivityProcess.setIsApproval("1");
+                        enname = "cw";
+                        vars.put("cwList", auditUsers);
+                        vars.put("cwcount",auditUsers.size());
+                    } else {
+                        notifyRole = "调整报销";
+                        workActivityProcess.setIsApproval("2");
                     }
                     break;
-                } else if ("fgld".equals(taskDefKey) && count.contains("2")) {
+                } /*else if ("fgld".equals(taskDefKey) && count.contains("2")) {
                     taskCount = "2";
                     exp = "pass";
                     if ("yes".equals(workReimbursement.getAct().getFlag())) {
@@ -727,8 +749,8 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                         workActivityProcess.setIsApproval("2");
                     }
                     break;
-                } else if ("cw".equals(taskDefKey) && count.contains("3")) {
-                    taskCount = "3";
+                }*/ else if ("cw".equals(taskDefKey) && count.contains("2")) {
+                    taskCount = "2";
                     exp = "pass";
                     if ("yes".equals(workReimbursement.getAct().getFlag())) {
                         workActivityProcessService.insertAuditsByType(auditUsers,workReimbursement.getProcessInstanceId(),4,1);
@@ -742,10 +764,10 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                         workActivityProcess.setIsApproval("2");
                     }
                     break;
-                } else if ("zjl".equals(taskDefKey) && count.contains("4")) {
-                    taskCount = "4";
+                } else if ("zjl".equals(taskDefKey) && count.contains("3")) {
+                    taskCount = "3";
                     exp = "pass";
-                    if ("yes".equals(workReimbursement.getAct().getFlag())) {
+                    /*if ("yes".equals(workReimbursement.getAct().getFlag())) {
                         notifyRole = "财务分管领导审核";
                         workActivityProcessService.insertAuditsByType(auditUsers,workReimbursement.getProcessInstanceId(),5,1);
 
@@ -756,9 +778,16 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                     } else {
                         workActivityProcess.setIsApproval("2");
                         notifyRole = "调整报销";
+                    }*/
+                    if ("yes".equals(workReimbursement.getAct().getFlag())) {
+                        notifyRole = "审批通过";
+                        workActivityProcess.setIsApproval("1");
+                    } else {
+                        notifyRole = "调整报销";
+                        workActivityProcess.setIsApproval("2");
                     }
                     break;
-                } else if ("cwzj".equals(taskDefKey) && count.contains("5")) {
+                } /*else if ("cwzj".equals(taskDefKey) && count.contains("5")) {
                     taskCount = "5";
                     exp = "pass";
                     if ("yes".equals(workReimbursement.getAct().getFlag())) {
@@ -784,7 +813,7 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                         workActivityProcess.setIsApproval("2");
                     }
                     break;
-                } else if ("modifyApply".equals(taskDefKey)&& count.contains("0")) {
+                }*/ else if ("modifyApply".equals(taskDefKey)&& count.contains("0")) {
                     taskCount = "0";
                     notifyRole = "部门负责人审批";
                     exp = "pass";
@@ -890,7 +919,8 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
             }
             workActivityProcessService.deleteProcessIdAuditUsers(workReimbursement.getProcessInstanceId());
         } else {
-            if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("reimbursement")) {
+            //if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("reimbursement")) {
+            if (StringUtils.isNotBlank(workActivityMenu.getProcessType()) && !workActivityMenu.getProcessType().equals("newReimbursement")) {
                 WorkProjectNotify notify = new WorkProjectNotify();
                 notify.setNotifyId(workReimbursement.getId());
                 userList = workProjectNotifyService.readByNotifyId(notify);

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementController.java

@@ -302,26 +302,28 @@ public class WorkReimbursementController extends BaseController {
 			if ("bmzr".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),2);
 				if (users==null )
-					users = UserUtils.getByRoleActivityEnname("fgld",2,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
-			}else  if ("fgld".equals(taskDefKey)){
+					//users = UserUtils.getByRoleActivityEnname("fgld",2,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
+					users = UserUtils.getByRoleActivityEnname("cwzg", 3, workReimbursement.getOfficeId(), "8", workReimbursement.getCreateBy());
+			}/*else  if ("fgld".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);
 				if (users==null )
 					users = UserUtils.getByRoleActivityEnname("cwzg", 3, workReimbursement.getOfficeId(), "8", workReimbursement.getCreateBy());
-			}else  if ("cw".equals(taskDefKey)){
-				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),4);
+			}*/else  if ("cw".equals(taskDefKey)){
+				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);
 				if (users==null )
 				users = UserUtils.getByRoleActivityEnname("zjl",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
 			}else  if ("zjl".equals(taskDefKey)){
-				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),5);
+				/*users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),5);
 				if (users==null )
-					users = UserUtils.getByRoleActivityEnname("cwfgld",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
-			}else  if ("cwzj".equals(taskDefKey)){
+					users = UserUtils.getByRoleActivityEnname("cwfgld",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());*/
+				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
+			}/*else if ("cwzj".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),6);
 				if (users==null )
 					users = UserUtils.getByRoleActivityEnname("cn",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
 			}else if ("cn".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
-			}else if ("modifyApply".equals(taskDefKey)){
+			}*/else if ("modifyApply".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
 			}
             String flag = workReimbursement.getAct().getFlag();

src/main/webapp/webpage/modules/workreimbursement/workReimbursementAudit.jsp

@@ -167,8 +167,14 @@
 					<input readonly="readonly" class="form-control layui-input" value="<fmt:formatDate value="${workReimbursement.submitterDate}" pattern="yyyy-MM-dd"/>"/>
 				</div>
 			</div>
+			<div class="layui-item layui-col-sm6 with-textarea">
+				<label class="layui-form-label ">备注：</label>
+				<div class="layui-input-block">
+					<form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255" value="${workReimbursement.remarks}"  class="form-control "/>
+				</div>
+			</div>
 		</div>
-		<div class="form-group layui-row">
+		<%--<div class="form-group layui-row">
 			<div class="form-group-label"><h2>借款明细</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container" >
 				<table id="contentTable3" class="table table-bordered table-condensed can-edit no-bottom-margin">
@@ -244,7 +250,7 @@
 					</tr>
 				</table>
 			</div>
-		</div>
+		</div>--%>
 		<div class="form-group layui-row">
 			<div class="form-group-label"><h2>报销详情</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container" >

src/main/webapp/webpage/modules/workreimbursement/workReimbursementCWAudit.jsp

@@ -202,9 +202,15 @@
             })
             $("#checkMoneys").val(formatNumber(money,2));
             $("#sumcheckMoneys").val(money);
+            var a = parseFloat($("#backmoney").val());
             var backmoneys=(parseFloat(money)-  parseFloat($("#backmoney").val())).toFixed(2);
-            $("#backmoneys").val(formatNumber(backmoneys,2));
-            $("#sumbackmoneys").val(backmoneys);
+            if(isNaN(backmoneys)){
+                $("#backmoneys").val("");
+                $("#sumbackmoneys").val("");
+            }else{
+                $("#backmoneys").val(formatNumber(backmoneys,2));
+                $("#sumbackmoneys").val(backmoneys);
+            }
         }
         function isNumber(val){
             if(val === "" || val ==null){
@@ -344,8 +350,14 @@
                         <input readonly="readonly" class="form-control layui-input" value="<fmt:formatDate value="${workReimbursement.submitterDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm6 with-textarea">
+                    <label class="layui-form-label ">备注：</label>
+                    <div class="layui-input-block">
+                        <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255" value="${workReimbursement.remarks}"  class="form-control "/>
+                    </div>
+                </div>
             </div>
-            <div class="form-group layui-row">
+            <%--<div class="form-group layui-row">
                 <div class="form-group-label"><h2>借款明细</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
                     <table id="contentTable3" class="table table-bordered table-condensed can-edit no-bottom-margin">
@@ -421,7 +433,7 @@
                         </tr>
                     </table>
                 </div>
-            </div>
+            </div>--%>
         <div class="form-group layui-row">
             <div class="form-group-label"><h2>报销详情</h2></div>
             <div class="layui-item layui-col-xs12 form-table-container" >

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormAdd.jsp

@@ -598,9 +598,14 @@
                            value="<fmt:formatDate value="${submitterDate.submitterDate}" pattern="yyyy-MM-dd"/>"/>
                 </div>
             </div>
-
+            <div class="layui-item layui-col-sm6 with-textarea">
+                <label class="layui-form-label ">备注：</label>
+                <div class="layui-input-block">
+                    <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255" value="${workReimbursement.remarks}"  class="form-control "/>
+                </div>
+            </div>
         </div>
-        <div class="form-group layui-row">
+        <%--<div class="form-group layui-row">
             <div class="form-group-label"><h2>借款明细</h2></div>
             <div class="layui-item layui-col-xs12 form-table-container" >
                 <table id="contentTable3" class="table table-bordered table-condensed can-edit no-bottom-margin">
@@ -718,7 +723,7 @@
                     }
                 </script>
             </div>
-        </div>
+        </div>--%>
         <div class="form-group layui-row">
             <div class="form-group-label"><h2>报销详情</h2></div>
             <div class="layui-item nav-btns">

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormDetail.jsp

@@ -170,8 +170,14 @@
                 <input readonly="readonly" class="form-control layui-input" value="<fmt:formatDate value="${workReimbursement.submitterDate}" pattern="yyyy-MM-dd"/>"/>
             </div>
         </div>
+        <div class="layui-item layui-col-sm6 with-textarea">
+            <label class="layui-form-label ">备注：</label>
+            <div class="layui-input-block">
+                <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255" value="${workReimbursement.remarks}"  class="form-control "/>
+            </div>
+        </div>
     </div>
-    <div class="form-group layui-row">
+    <%--<div class="form-group layui-row">
         <div class="form-group-label"><h2>借款明细</h2></div>
         <div class="layui-item layui-col-xs12 form-table-container" >
             <table id="contentTable3" class="table table-bordered table-condensed can-edit no-bottom-margin">
@@ -247,7 +253,7 @@
                 </tr>
             </table>
         </div>
-    </div>
+    </div>--%>
     <div class="form-group layui-row">
         <div class="form-group-label"><h2>报销详情</h2></div>
         <div class="layui-item layui-col-xs12 form-table-container" >

src/main/webapp/webpage/modules/workreimbursement/workReimbursementModifyApply.jsp

@@ -607,8 +607,14 @@
                            value="<fmt:formatDate value="${submitterDate.submitterDate}" pattern="yyyy-MM-dd"/>"/>
                 </div>
             </div>
+            <div class="layui-item layui-col-sm6 with-textarea">
+                <label class="layui-form-label ">备注：</label>
+                <div class="layui-input-block">
+                    <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255" value="${workReimbursement.remarks}"  class="form-control "/>
+                </div>
+            </div>
     </div>
-        <div class="form-group layui-row">
+        <%--<div class="form-group layui-row">
             <div class="form-group-label"><h2>借款明细</h2></div>
             <div class="layui-item layui-col-xs12 form-table-container" >
                 <table id="contentTable3" class="table table-bordered table-condensed can-edit no-bottom-margin">
@@ -726,7 +732,7 @@
                     }
                 </script>
             </div>
-        </div>
+        </div>--%>
     <div class="form-group layui-row">
         <div class="form-group-label"><h2>报销详情</h2></div>
         <div class="layui-item nav-btns">