Merge remote-tracking branch 'origin/master'

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

@@ -41,10 +41,7 @@ import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
 import com.jeeplus.modules.workreimbursement.dao.ReimbursementVATTaxDao;
 import com.jeeplus.modules.workreimbursement.dao.WorkAccountDao;
 import com.jeeplus.modules.workreimbursement.dao.WorkReimbursementDao;
-import com.jeeplus.modules.workreimbursement.entity.ReimbursementVATTax;
-import com.jeeplus.modules.workreimbursement.entity.WorkAccount;
-import com.jeeplus.modules.workreimbursement.entity.WorkAccountAudit;
-import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
+import com.jeeplus.modules.workreimbursement.entity.*;
 import com.jeeplus.modules.workreimbursement.utils.HistoicFlowUtil;
 import com.jeeplus.modules.workreimbursement.utils.VarStr;
 import com.jeeplus.modules.workreimbursementback.dao.WorkReimbursementBackDao;
@@ -126,6 +123,8 @@ public class WorkReimbursementAllService extends CrudService<WorkReimbursementDa
     private ProjectReportDataService projectReportDataService;
     @Autowired
     private HistoicFlowUtil histoicFlowUtil;
+    @Autowired
+    private WorkReimbursementTypeService workReimbursementTypeService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -249,15 +248,29 @@ public class WorkReimbursementAllService extends CrudService<WorkReimbursementDa
         for (WorkReimbursement info: list) {
             WorkAccount workAccount = info.getWorkAccount();
             if(null != workAccount){
-                if(0 == workAccount.getProjectRadio()){
+                if (null == workAccount.getType()){
                     ProjectRecords project = new ProjectRecords();
                     project.setProjectName(workAccount.getReimburseRemarks());
                     info.setProject(project);
-                }
-                //查询项目报告信息
-                if (StringUtils.isNotBlank(info.getWorkAccount().getProject().getId())){
-                    ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(info.getWorkAccount().getProject().getId());
-                    info.setProjectName(projectReportData.getNumber());
+                    info.getWorkAccount().setProjectRadio(2);
+                }else if (null != workAccount.getType()) {
+                    WorkReimbursementTypeInfo workReimbursementTypeInfo= workReimbursementTypeService.get(workAccount.getType());
+                    if (null != workReimbursementTypeInfo){
+                        String pid=workReimbursementTypeInfo.getParentIds().split(",")[1];
+                        if("1".equals(pid) ){
+                            //查询项目报告信息
+                            if (StringUtils.isNotBlank(info.getWorkAccount().getProject().getId())){
+                                ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(info.getWorkAccount().getProject().getId());
+                                info.setProjectName(projectReportData.getNumber());
+                            }
+                            info.getWorkAccount().setProjectRadio(1);
+                        }else{
+                            ProjectRecords project = new ProjectRecords();
+                            project.setProjectName(workAccount.getReimburseRemarks());
+                            info.setProject(project);
+                            info.getWorkAccount().setProjectRadio(2);
+                        }
+                    }
                 }
                 info.setBusinessTypeName(workAccount.getTypeName());
             }
@@ -569,7 +582,7 @@ public class WorkReimbursementAllService extends CrudService<WorkReimbursementDa
                         workAccount.setFinancialSubjects(workAccount.getFinancialSubjectss());
                     }
                     workAccount.setWorkReimbursement(workReimbursement);
-                    if (StringUtils.isBlank(workAccount.getId()) && workAccount.getMoney() != null) {
+                    if (StringUtils.isBlank(workAccount.getId())) {
                         workAccount.preInsert();
                         workAccountDao.insert(workAccount);
                     } else {
@@ -1382,6 +1395,30 @@ public class WorkReimbursementAllService extends CrudService<WorkReimbursementDa
         }
 
     }
+    /**
+     * 判断是否是项目还是非项目
+     * @param workReimbursement
+     */
+    public void isNotProject(WorkReimbursement workReimbursement) {
+        List<WorkAccount> workAccounts = workReimbursement.getWorkAccountList();
+        for (WorkAccount workAccount:workAccounts){
+            if(null != workAccount){
+                if (null == workAccount.getType()){
+                    workAccount.setProjectRadio(2);
+                }else if (null != workAccount.getType()) {
+                    WorkReimbursementTypeInfo workReimbursementTypeInfo= workReimbursementTypeService.get(workAccount.getType());
+                    if (null != workReimbursementTypeInfo){
+                        String pid=workReimbursementTypeInfo.getParentIds().split(",")[1];
+                        if("1".equals(pid) ){
+                            workAccount.setProjectRadio(1);
+                        }else{
+                            workAccount.setProjectRadio(2);
+                        }
+                    }
+                }
+            }
+        }
+    }
 
     /**
      * 查询待办任务

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

@@ -268,20 +268,26 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
                     ProjectRecords project = new ProjectRecords();
                     project.setProjectName(workAccount.getReimburseRemarks());
                     info.setProject(project);
+                    info.getWorkAccount().setProjectRadio(2);
                 }else if (null != workAccount.getType()){
                     WorkReimbursementTypeInfo workReimbursementTypeInfo= workReimbursementTypeService.get(workAccount.getType());
-                    String pid=workReimbursementTypeInfo.getParentIds().split(",")[1];
-                    if("0" == pid){
-                        ProjectRecords project = new ProjectRecords();
-                        project.setProjectName(workAccount.getReimburseRemarks());
-                        info.setProject(project);
-                    }else{
-                        //查询项目报告信息
-                        if (StringUtils.isNotBlank(info.getWorkAccount().getProject().getId())){
-                            ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(info.getWorkAccount().getProject().getId());
-                            info.setProjectName(projectReportData.getNumber());
+                    if (null != workReimbursementTypeInfo){
+                        String pid=workReimbursementTypeInfo.getParentIds().split(",")[1];
+                        if("1".equals(pid) ){
+                            //查询项目报告信息
+                            if (StringUtils.isNotBlank(info.getWorkAccount().getProject().getId())){
+                                ProjectReportData projectReportData = projectReportDataService.getReportDataByProjectId(info.getWorkAccount().getProject().getId());
+                                info.setProjectName(projectReportData.getNumber());
+                            }
+                            info.getWorkAccount().setProjectRadio(1);
+                        }else{
+                            ProjectRecords project = new ProjectRecords();
+                            project.setProjectName(workAccount.getReimburseRemarks());
+                            info.setProject(project);
+                            info.getWorkAccount().setProjectRadio(2);
                         }
                     }
+
                 }
 
                 info.setBusinessTypeName(workAccount.getTypeName());
@@ -1407,6 +1413,32 @@ public class WorkReimbursementService extends CrudService<WorkReimbursementDao,
     }
 
     /**
+     * 判断是否是项目还是非项目
+     * @param workReimbursement
+     */
+    public void isNotProject(WorkReimbursement workReimbursement) {
+        List<WorkAccount> workAccounts = workReimbursement.getWorkAccountList();
+        for (WorkAccount workAccount:workAccounts){
+            if(null != workAccount){
+                if (null == workAccount.getType()){
+                    workAccount.setProjectRadio(2);
+                }else if (null != workAccount.getType()) {
+                    WorkReimbursementTypeInfo workReimbursementTypeInfo= workReimbursementTypeService.get(workAccount.getType());
+                    if (null != workReimbursementTypeInfo){
+                        String pid=workReimbursementTypeInfo.getParentIds().split(",")[1];
+                        if("1".equals(pid) ){
+                            workAccount.setProjectRadio(1);
+                        }else{
+                            workAccount.setProjectRadio(2);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+    /**
      * 查询待办任务
      *
      * @param userId

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

@@ -36,6 +36,7 @@ import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import com.jeeplus.modules.workfullmanage.service.WorkFullManageService;
+import com.jeeplus.modules.workreimbursement.entity.WorkAccount;
 import com.jeeplus.modules.workreimbursement.entity.WorkReimbursement;
 import com.jeeplus.modules.workreimbursement.entity.WorkReimbursementTypeInfo;
 import com.jeeplus.modules.workreimbursement.service.WorkReimbursementAllService;
@@ -175,6 +176,7 @@ public class WorkReimbursementAllController extends BaseController {
 //	@RequiresPermissions(value={"workreimbursement:workReimbursementAll:add","workreimbursement:workReimbursementAll:edit"})
 	@RequestMapping(value = "form")
 	public String form(WorkReimbursement workReimbursement,Model model) {
+		workReimbursementService.isNotProject(workReimbursement);
 		String view = "workReimbursementFormAdd";
 		Office office = UserUtils.getSelectOffice();
 		String tabId = request.getParameter("tabId");

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

@@ -201,6 +201,7 @@ public class WorkReimbursementController extends BaseController {
 //	@RequiresPermissions(value={"workreimbursement:workReimbursement:view","workreimbursement:workReimbursement:add","workreimbursement:workReimbursement:edit"},logical=Logical.OR)
 	@RequestMapping(value = "form")
 	public String form(WorkReimbursement workReimbursement,Model model) {
+		workReimbursementService.isNotProject(workReimbursement);
 		String view = "workReimbursementFormAdd";
 		Office office = UserUtils.getSelectOffice();
 		String tabId = request.getParameter("tabId");

src/main/webapp/webpage/modules/sys/tagTreeselectReimbur.jsp

@@ -58,10 +58,10 @@
 					tree.expandNode(nodes[i], true, false, false);
 				}
 				//异步加载子节点（加载用户）
-				var nodesOne = tree.getNodesByParam("isParent", true);
-				for(var j=0; j<nodesOne.length; j++) {
-					tree.reAsyncChildNodes(nodesOne[j],"!refresh",false);
-				}
+				// var nodesOne = tree.getNodesByParam("isParent", true);
+				// for(var j=0; j<nodesOne.length; j++) {
+				// 	tree.reAsyncChildNodes(nodesOne[j],"!refresh",false);
+				// }
 				selectCheckNode();
 			});
 			key = $("#key");

src/main/webapp/webpage/modules/sys/tagTreeselectReported.jsp

@@ -54,14 +54,14 @@
 				
 				// 默认展开一级节点
 				var nodes = tree.getNodesByParam("level", 0);
-				for(var i=0; i<nodes.length; i++) {
-					tree.expandNode(nodes[i], true, false, false);
-				}
+				// for(var i=0; i<nodes.length; i++) {
+				// 	tree.expandNode(nodes[i], true, false, false);
+				// }
 				//异步加载子节点（加载用户）
-				var nodesOne = tree.getNodesByParam("isParent", true);
-				for(var j=0; j<nodesOne.length; j++) {
-					tree.reAsyncChildNodes(nodesOne[j],"!refresh",false);
-				}
+				// var nodesOne = tree.getNodesByParam("isParent", true);
+				// for(var j=0; j<nodesOne.length; j++) {
+				// 	tree.reAsyncChildNodes(nodesOne[j],"!refresh",false);
+				// }
 				selectCheckNode();
 			});
 			key = $("#key");