开票功能调整

src/main/java/com/jeeplus/modules/filialeWorkInvoice/service/FilialeWorkInvoiceService.java

@@ -168,8 +168,8 @@ public class FilialeWorkInvoiceService extends CrudService<FilialeWorkInvoiceDao
 						}
 					}
 				}else if(projectRelation.getIsProject()==2){
-					projectRelation.setProjectName("内容");
-					projectRelation.setWorkContractName(projectRelation.getDetails());
+					projectRelation.setProjectName(projectRelation.getDetails());
+					//projectRelation.setWorkContractName(projectRelation.getDetails());
 				}
 			}
 			//如果发票对账地区为空，则将第一个项目信息的所在地添加到对账地区

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectSignatureOldMessageDisposeController.java

@@ -188,7 +188,7 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
     public Map<String,Object> reportView(){
         Map<String,Object> map = new HashMap<>();
         final Calendar c = Calendar.getInstance();
-        Integer year = 2023;
+        Integer year = 2024;
         System.out.println(c.get(Calendar.DATE));
         System.out.println(c.getActualMaximum(Calendar.DATE));
         //if (c.get(Calendar.DATE) == c.getActualMaximum(Calendar.DATE)){
@@ -197,20 +197,20 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         //当月最后一天
         //projectRecordsService.getBatchArchiveNotify();
         logger.info("-----------公司级—月度报表（开始）------------------");
-        //statementCompanyComprehensiveService.disposeStatementCompany(year,2,month);
+        statementCompanyComprehensiveService.disposeStatementCompany(year,2,month);
         logger.info("------------公司级—月度报表（结束）------------------");
-        /*logger.info("-----------部门级—月度报表（开始）------------------");
+        logger.info("-----------部门级—月度报表（开始）------------------");
         //statementCompanyComprehensiveService.disposeStatementOffice(year,2,month);
         logger.info("------------部门级—月度报表（结束）------------------");
         logger.info("------------公司级—年度报表(月报中年度信息)（开始)------------------");
-        statementCompanyComprehensiveService.disposeStatementCompanyByYear(year,0,month);
+        //statementCompanyComprehensiveService.disposeStatementCompanyByYear(year,0,month);
         logger.info("------------公司级—年度报表(月报中年度信息)（结束）------------------");
         logger.info("-----------部门级—年度报表(月报中年度信息)（开始）------------------");
         //statementCompanyComprehensiveService.disposeStatementOfficeByYear(year,0,month);
         logger.info("------------部门级—年度报表(月报中年度信息)（结束）------------------");
         logger.info("-----------张静—月度报表（开始）------------------");
         // statementCompanyComprehensiveService.disposeReportDataStatementCompany(year,2,month);
-        logger.info("------------张静—月度报表（结束）------------------");*/
+        logger.info("------------张静—月度报表（结束）------------------");
 
         logger.info("-----------批量归档报表（开始）------------------");
         //statementCompanyComprehensiveService.disposeFilingStatementCompany(year,2,month);

src/main/java/com/jeeplus/modules/workcalendar/service/WorkCalendarTaskService.java

@@ -171,18 +171,78 @@ public class WorkCalendarTaskService  {
             logger.info("-----------公司级—月度报表（开始）------------------");
             statementCompanyComprehensiveService.disposeStatementCompany(year,2,month);
             logger.info("------------公司级—月度报表（结束）------------------");
+
+        }
+
+    }
+
+    /**
+     * 月度报表
+     */
+    //每个月最后一天晚上23点推送
+    @Scheduled(cron= "0 10 23 28-31 * ?")
+    //@Scheduled(cron= "0 0/2 * * * ?")
+    @Transactional(readOnly = false)
+    public void getYearStatementCompanyComprehensiveOnMonth() {
+        final Calendar c = Calendar.getInstance();
+        Integer year = c.get(Calendar.YEAR);
+        System.out.println(c.get(Calendar.DATE));
+        System.out.println(c.getActualMaximum(Calendar.DATE));
+        if (c.get(Calendar.DATE) == c.getActualMaximum(Calendar.DATE)){
+
+            Integer month = c.get(Calendar.MONTH)+1; //第一个月从0开始，所以得到月份＋1
+            //当月最后一天
             logger.info("------------公司级—年度报表(月报中年度信息)（开始)------------------");
             statementCompanyComprehensiveService.disposeStatementCompanyByYear(year,0,month);
             logger.info("------------公司级—年度报表(月报中年度信息)（结束）------------------");
+
+        }
+
+    }
+
+    /**
+     * 月度报表
+     */
+    //每个月最后一天晚上23点推送
+    @Scheduled(cron= "0 20 23 28-31 * ?")
+    //@Scheduled(cron= "0 0/2 * * * ?")
+    @Transactional(readOnly = false)
+    public void getOfficeStatementCompanyComprehensiveOnMonth() {
+        final Calendar c = Calendar.getInstance();
+        Integer year = c.get(Calendar.YEAR);
+        System.out.println(c.get(Calendar.DATE));
+        System.out.println(c.getActualMaximum(Calendar.DATE));
+        if (c.get(Calendar.DATE) == c.getActualMaximum(Calendar.DATE)){
+
+            Integer month = c.get(Calendar.MONTH)+1; //第一个月从0开始，所以得到月份＋1
+            //当月最后一天
             logger.info("-----------部门级—月度报表（开始）------------------");
             statementCompanyComprehensiveService.disposeStatementOffice(year,2,month);
             logger.info("------------部门级—月度报表（结束）------------------");
+
+        }
+
+    }
+
+    /**
+     * 月度报表
+     */
+    //每个月最后一天晚上23点推送
+    @Scheduled(cron= "0 30 23 28-31 * ?")
+    //@Scheduled(cron= "0 0/2 * * * ?")
+    @Transactional(readOnly = false)
+    public void getOfficeYearStatementCompanyComprehensiveOnMonth() {
+        final Calendar c = Calendar.getInstance();
+        Integer year = c.get(Calendar.YEAR);
+        System.out.println(c.get(Calendar.DATE));
+        System.out.println(c.getActualMaximum(Calendar.DATE));
+        if (c.get(Calendar.DATE) == c.getActualMaximum(Calendar.DATE)){
+
+            Integer month = c.get(Calendar.MONTH)+1; //第一个月从0开始，所以得到月份＋1
+            //当月最后一天
             logger.info("-----------部门级—年度报表(月报中年度信息)（开始）------------------");
             statementCompanyComprehensiveService.disposeStatementOfficeByYear(year,0,month);
             logger.info("------------部门级—年度报表(月报中年度信息)（结束）------------------");
-            /*logger.info("-----------张静—月度报表（开始）------------------");
-            statementCompanyComprehensiveService.disposeReportDataStatementCompany(year,2,month);
-            logger.info("------------张静—月度报表（结束）------------------");*/
             logger.info("-----------公司级—批量归档月度报表（开始）------------------");
             statementCompanyComprehensiveService.disposeFilingStatementCompany(year,2,month);
             logger.info("------------公司级—批量归档月度报表（结束）------------------");

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceAllService.java

@@ -36,6 +36,7 @@ import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import com.jeeplus.modules.workinvoice.dao.WorkInvoiceDao;
 import com.jeeplus.modules.workinvoice.dao.WorkInvoiceReceiptDao;
@@ -164,8 +165,8 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 						}
 					}
 				}else if(projectRelation.getIsProject()==2){
-					projectRelation.setProjectName("内容");
-					projectRelation.setWorkContractName(projectRelation.getDetails());
+					projectRelation.setProjectName(projectRelation.getDetails());
+					//projectRelation.setWorkContractName(projectRelation.getDetails());
 				}
 			}
 			//如果发票对账地区为空，则将第一个项目信息的所在地添加到对账地区
@@ -2306,6 +2307,8 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 		}
 	}
 	public void queryDetails(WorkInvoice workInvoice) {
+		List<WorkInvoiceProjectRelation> projectRelation = getProjectRelation(workInvoice);
+		workInvoice.setWorkInvoiceProjectRelationList(projectRelation);
 		if(workInvoice==null)return;
 		WorkClientAttachment attchment = new WorkClientAttachment();
 		attchment.setAttachmentId(workInvoice.getId());
@@ -2335,7 +2338,7 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 				if ( projectRelation.getIsProject() == 2) {
 					projectRelation.setProjectName(projectRelation.getDetails());
 					//判断是否选择合同，选择合同则将合同信息以及委托方查询并放入
-					/*if(StringUtils.isNotBlank(projectRelation.getContractId())){
+					if(StringUtils.isNotBlank(projectRelation.getContractId())){
 						WorkContractInfo workContractInfo = contractInfoService.get(projectRelation.getContractId());
 						projectRelation.setWorkContractName(workContractInfo.getName());
 						if(null != workContractInfo.getClient() && StringUtils.isNotBlank(workContractInfo.getClient().getName())){
@@ -2344,7 +2347,7 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 					}else{
 						projectRelation.setWorkContractName("");
 						projectRelation.setClientName("");
-					}*/
+					}
 				}
 			}
 		}

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceService.java

@@ -39,6 +39,7 @@ import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import com.jeeplus.modules.workinvoice.dao.WorkInvoiceDao;
 import com.jeeplus.modules.workinvoice.dao.WorkInvoiceReceiptDao;
@@ -176,8 +177,8 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 						}
 					}
 				}else if(projectRelation.getIsProject()==2){
-					projectRelation.setProjectName("内容");
-					projectRelation.setWorkContractName(projectRelation.getDetails());
+					projectRelation.setProjectName(projectRelation.getDetails());
+					//projectRelation.setWorkContractName(projectRelation.getDetails());
 				}
 			}
 			//如果发票对账地区为空，则将第一个项目信息的所在地添加到对账地区
@@ -228,7 +229,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 				if ( projectRelation.getIsProject() == 2) {
 					projectRelation.setProjectName(projectRelation.getDetails());
 					//判断是否选择合同，选择合同则将合同信息以及委托方查询并放入
-					/*if(StringUtils.isNotBlank(projectRelation.getContractId())){
+					if(StringUtils.isNotBlank(projectRelation.getContractId())){
 						WorkContractInfo workContractInfo = contractInfoService.get(projectRelation.getContractId());
 						projectRelation.setWorkContractName(workContractInfo.getName());
 						if(null != workContractInfo.getClient() && StringUtils.isNotBlank(workContractInfo.getClient().getName())){
@@ -237,7 +238,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 					}else{
 						projectRelation.setWorkContractName("");
 						projectRelation.setClientName("");
-					}*/
+					}
 				}
 			}
 		}
@@ -3778,8 +3779,8 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 							}
 						}
 					}else if(projectRelation.getIsProject()==2){
-						projectRelation.setProjectName("内容");
-						projectRelation.setWorkContractName(projectRelation.getDetails());
+						projectRelation.setProjectName(projectRelation.getDetails());
+						//projectRelation.setWorkContractName(projectRelation.getDetails());
 					}
 				}
 				workInvoice.setWorkInvoiceProjectRelationList(projectRelationList);

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllController.java

@@ -378,6 +378,18 @@ public class WorkInvoiceAllController extends BaseController {
 			if(StringUtils.isNotBlank(bankName)){
 				workInvoice.setBank(bankName);
 			}
+			//判定 项目是否是非项目，如果是非项目 是否存在合同名称，如果没有关联合同，则合同名称处以-----进行展示
+			if(workInvoice.getWorkInvoiceProjectRelationList().size()>0){
+				List<WorkInvoiceProjectRelation> workInvoiceProjectRelationList = workInvoice.getWorkInvoiceProjectRelationList();
+				for (WorkInvoiceProjectRelation workInvoiceProjectRelation : workInvoiceProjectRelationList) {
+					if(2 == workInvoiceProjectRelation.getIsProject()){
+						//判定是否存在合同信息，若不存在，则合同名称展示------
+						if(StringUtils.isBlank(workInvoiceProjectRelation.getWorkContractName())){
+							workInvoiceProjectRelation.setWorkContractName("————————————");
+						}
+					}
+				}
+			}
 			view = "workInvoiceView";
 		}else if("3".equals(tabId)){
 			List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -175,6 +175,7 @@ import com.jeeplus.modules.workgoout.service.GoOutService;
 import com.jeeplus.modules.workincomingmessage.entity.WorkIncomingMessage;
 import com.jeeplus.modules.workincomingmessage.service.WorkIncomingMessageService;
 import com.jeeplus.modules.workinvoice.entity.WorkInvoice;
+import com.jeeplus.modules.workinvoice.entity.WorkInvoiceProjectRelation;
 import com.jeeplus.modules.workinvoice.service.WorkInvoiceService;
 import com.jeeplus.modules.workinvoicealter.entity.WorkInvoiceAlter;
 import com.jeeplus.modules.workinvoicealter.service.WorkInvoiceAlterService;
@@ -2387,77 +2388,8 @@ public class WorkProjectNotifyController extends BaseController {
 						return "modules/workinvoice/workInvoiceExamineModify";
 					}
 				} else if (workProjectNotify.getType().equals("213")) {    //非项目开票管理
-					WorkInvoice workInvoice = workInvoiceService.get(workProjectNotify.getNotifyId());
-					if (StringUtils.isNotBlank(workInvoice.getId())) {
-						workInvoiceService.queryDetails(workInvoice);
-					}
-					if (StringUtils.isNotBlank(workProjectNotify.getHome())) {
-						workInvoice.setHome(workProjectNotify.getHome());
-					} else {
-						workInvoice.setHome("home");
-					}
-
-					//查询关联红冲发票的开票号
-					if("1".equals(workInvoice.getRedInvoiceFlag()) && StringUtils.isNotBlank(workInvoice.getRedInvoiceRelevancyId())){
-						String invoiceNumberStr = workInvoiceService.getInvoiceNumberStr(workInvoice.getRedInvoiceRelevancyId());
-						workInvoice.setInvoiceNumberStr(invoiceNumberStr);
-					}
-
-					//获取发票开户银行信息
-					String bankName = workInvoiceService.getBankNameByNameOrId(workInvoice.getBank());
-					if (StringUtils.isNotBlank(bankName)) {
-						workInvoice.setBank(bankName);
-					}
-					workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
-					String taskDefKey = workInvoice.getAct().getTaskDefKey();
-					model.addAttribute("workInvoice", workInvoice);
-					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 
-						List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
-						for (MainDictDetail dictDetail : billingContentList) {
-							if (workInvoice.getBillingContent().equals(dictDetail.getValue())) {
-								workInvoice.setBillingContent(dictDetail.getLabel());
-								break;
-							}
-						}
-						List<MainDictDetail> receiptTypeList = DictUtils.getMainDictList("receipt_type");
-						for (MainDictDetail dictDetail : receiptTypeList) {
-							if (workInvoice.getChargeType().equals(dictDetail.getValue())) {
-								workInvoice.setChargeType(dictDetail.getLabel());
-								break;
-							}
-						}
-						return "modules/workinvoice/workInvoiceView";
-					} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-
-						List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
-						for (MainDictDetail dictDetail : billingContentList) {
-							if (workInvoice.getBillingContent().equals(dictDetail.getValue())) {
-								workInvoice.setBillingContent(dictDetail.getLabel());
-								break;
-							}
-						}
-						List<MainDictDetail> receiptTypeList = DictUtils.getMainDictList("receipt_type");
-						for (MainDictDetail dictDetail : receiptTypeList) {
-							if (workInvoice.getChargeType().equals(dictDetail.getValue())) {
-								workInvoice.setChargeType(dictDetail.getLabel());
-								break;
-							}
-						}
-						model.addAttribute("identification", "workinvoice");
-						model.addAttribute("identificationName", "发票审核意见");
-						if (StringUtils.isNotBlank(taskDefKey) && ("bmzr".equals(taskDefKey) ||
-								"scbzr".equals(taskDefKey)) || "zjl".equals(taskDefKey)) {
-							return "modules/workinvoice/workInvoiceNotProjectAudit";
-						} else if (StringUtils.isNotBlank(taskDefKey) && "fpgly".equals(taskDefKey)) {
-							workInvoice.setDrawerName(UserUtils.getUser().getName());
-							workInvoice.setInvoiceDate(new Date());
-							model.addAttribute("workInvoice", workInvoice);
-							return "modules/workinvoice/workInvoiceNotProjectAuditEnd";
-						}
-					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
-						return "modules/workinvoice/workInvoiceNotProjectModify";
-					}
+					return this.getNotProjectWorkInvoice(workProjectNotify, model);
 				} else if (workProjectNotify.getType().equals("214")) {    //分公司非项目开票管理
 					FilialeWorkInvoice workInvoice = filialeWorkInvoiceService.get(workProjectNotify.getNotifyId());
 					if (StringUtils.isNotBlank(workInvoice.getId())) {
@@ -10906,4 +10838,111 @@ public class WorkProjectNotifyController extends BaseController {
 		return "modules/workinvoice/workInvoiceView";
 	}
 
+	/**
+	 * 业务用章申请
+	 * @param workProjectNotify
+	 * @param model
+	 * @return
+	 */
+	private String getNotProjectWorkInvoice(WorkProjectNotify workProjectNotify,Model model) {
+		WorkInvoice workInvoice = workInvoiceService.get(workProjectNotify.getNotifyId());
+		if (StringUtils.isNotBlank(workInvoice.getId())) {
+			workInvoiceService.queryDetails(workInvoice);
+		}
+		if (StringUtils.isNotBlank(workProjectNotify.getHome())) {
+			workInvoice.setHome(workProjectNotify.getHome());
+		} else {
+			workInvoice.setHome("home");
+		}
+
+		//查询关联红冲发票的开票号
+		if("1".equals(workInvoice.getRedInvoiceFlag()) && StringUtils.isNotBlank(workInvoice.getRedInvoiceRelevancyId())){
+			String invoiceNumberStr = workInvoiceService.getInvoiceNumberStr(workInvoice.getRedInvoiceRelevancyId());
+			workInvoice.setInvoiceNumberStr(invoiceNumberStr);
+		}
+
+		//获取发票开户银行信息
+		/*String bankName = workInvoiceService.getBankNameByNameOrId(workInvoice.getBank());
+		if (StringUtils.isNotBlank(bankName)) {
+			workInvoice.setBank(bankName);
+		}*/
+		workInvoice.setAct(getByAct(workInvoice.getProcessInstanceId()));
+		String taskDefKey = workInvoice.getAct().getTaskDefKey();
+		model.addAttribute("workInvoice", workInvoice);
+		if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
+
+			List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
+			for (MainDictDetail dictDetail : billingContentList) {
+				if (workInvoice.getBillingContent().equals(dictDetail.getValue())) {
+					workInvoice.setBillingContent(dictDetail.getLabel());
+					break;
+				}
+			}
+			List<MainDictDetail> receiptTypeList = DictUtils.getMainDictList("receipt_type");
+			for (MainDictDetail dictDetail : receiptTypeList) {
+				if (workInvoice.getChargeType().equals(dictDetail.getValue())) {
+					workInvoice.setChargeType(dictDetail.getLabel());
+					break;
+				}
+			}
+
+			//判定 项目是否是非项目，如果是非项目 是否存在合同名称，如果没有关联合同，则合同名称处以-----进行展示
+			if(workInvoice.getWorkInvoiceProjectRelationList().size()>0){
+				List<WorkInvoiceProjectRelation> workInvoiceProjectRelationList = workInvoice.getWorkInvoiceProjectRelationList();
+				for (WorkInvoiceProjectRelation workInvoiceProjectRelation : workInvoiceProjectRelationList) {
+					if(2 == workInvoiceProjectRelation.getIsProject()){
+						//判定是否存在合同信息，若不存在，则合同名称展示------
+						if(StringUtils.isBlank(workInvoiceProjectRelation.getWorkContractName())){
+							workInvoiceProjectRelation.setWorkContractName("————————————");
+						}
+					}
+				}
+			}
+			return "modules/workinvoice/workInvoiceView";
+		} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
+
+			List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
+			for (MainDictDetail dictDetail : billingContentList) {
+				if (workInvoice.getBillingContent().equals(dictDetail.getValue())) {
+					workInvoice.setBillingContent(dictDetail.getLabel());
+					break;
+				}
+			}
+			List<MainDictDetail> receiptTypeList = DictUtils.getMainDictList("receipt_type");
+			for (MainDictDetail dictDetail : receiptTypeList) {
+				if (workInvoice.getChargeType().equals(dictDetail.getValue())) {
+					workInvoice.setChargeType(dictDetail.getLabel());
+					break;
+				}
+			}
+
+			//判定 项目是否是非项目，如果是非项目 是否存在合同名称，如果没有关联合同，则合同名称处以-----进行展示
+			if(workInvoice.getWorkInvoiceProjectRelationList().size()>0){
+				List<WorkInvoiceProjectRelation> workInvoiceProjectRelationList = workInvoice.getWorkInvoiceProjectRelationList();
+				for (WorkInvoiceProjectRelation workInvoiceProjectRelation : workInvoiceProjectRelationList) {
+					if(2 == workInvoiceProjectRelation.getIsProject()){
+						//判定是否存在合同信息，若不存在，则合同名称展示------
+						if(StringUtils.isBlank(workInvoiceProjectRelation.getWorkContractName())){
+							workInvoiceProjectRelation.setWorkContractName("————————————");
+						}
+					}
+				}
+			}
+			model.addAttribute("identification", "workinvoice");
+			model.addAttribute("identificationName", "发票审核意见");
+			if (StringUtils.isNotBlank(taskDefKey) && ("bmzr".equals(taskDefKey) ||
+					"scbzr".equals(taskDefKey)) || "zjl".equals(taskDefKey)) {
+				return "modules/workinvoice/workInvoiceNotProjectAudit";
+			} else if (StringUtils.isNotBlank(taskDefKey) && "fpgly".equals(taskDefKey)) {
+				workInvoice.setDrawerName(UserUtils.getUser().getName());
+				workInvoice.setInvoiceDate(new Date());
+				model.addAttribute("workInvoice", workInvoice);
+				return "modules/workinvoice/workInvoiceNotProjectAuditEnd";
+			}
+		} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+			return "modules/workinvoice/workInvoiceNotProjectModify";
+		}
+		return "modules/workinvoice/workInvoiceView";
+	}
+
 }

src/main/resources/mappings/modules/statement/StatementCompanyComprehensiveDao.xml

@@ -910,7 +910,7 @@
 	<select id="getUserByOfficeId" resultType="com.jeeplus.modules.sys.entity.User">
 		select su.id,su.name,su.company_id as "company.id",su.office_id as "office.id" from sys_user su
 		<where>
-			su.del_flag = 0 and su.office_id = #{officeId}
+			su.del_flag = 0 and su.office_id = #{officeId} and su.login_flag = 1
 		</where>
 	</select>
 

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsAdminModify.jsp

@@ -822,7 +822,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目所在地：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselectProject id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
+                        <sys:treeselectProjectArea id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
                                                cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
                         <span id="areaShow" style="color: red"><c:if test="${projectRecords.area.id!=null}">${projectRecords.province}-${projectRecords.city}-${projectRecords.county}</c:if></span>
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoForm.jsp

@@ -476,7 +476,7 @@
 				}
 			}
 			layui.form.render("select");
-			form.render();
+			layui.form.render();
 		}
 		function setDp(obj){
 			$.ajax({
@@ -1184,7 +1184,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行：</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<select id="bank" name="bank" value="${workInvoice.bank}" lay-filter="bankFilter"></select>
 						<span id="bankRemarks" class="spanzj" style="color:red;"></span>
 						<%--<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>--%>

src/main/webapp/webpage/modules/workinvoice/workInvoiceExamineModify.jsp

@@ -1015,7 +1015,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6 count1">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行：</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<select id="bank" name="bank" value="${workInvoice.bank}" lay-filter="bankFilter"></select>
 						<span id="bankRemarks" class="spanzj" style="color:red;"></span>
 							<%--<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>--%>

src/main/webapp/webpage/modules/workinvoice/workInvoiceNotProjectAudit.jsp

@@ -35,6 +35,12 @@
 		}
 		$(document).ready(function() {
 
+			const input = document.getElementById('workContractInput');
+			if (input.value !== '————————————') {
+				input.style.color = '';
+				input.style.textAlign = '';
+			}
+
 			//初始化截图功能子页面。
 			$('#orgContent').attr("src","${ctx}/workinvoice/workInvoice/workInvoiceImageEdit");
 
@@ -511,7 +517,7 @@
 									<input type="text" value="${list.projectName}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td>
-									<input type="text" value="${list.workContractName}" readonly="readonly"  class="form-control"/>
+									<input type="text" id="workContractInput"  style="color: #9e9e9e;text-align: center;" value="${list.workContractName}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td style="text-align:center;">
 									<input type="text" value="${list.projectNum}" readonly="readonly"  class="form-control"/>

src/main/webapp/webpage/modules/workinvoice/workInvoiceNotProjectAuditEnd.jsp

@@ -72,6 +72,12 @@
 		  return false;
 		}
 		$(document).ready(function() {
+
+			const input = document.getElementById('workContractInput');
+			if (input.value !== '————————————') {
+				input.style.color = '';
+				input.style.textAlign = '';
+			}
 			//初始化截图功能子页面。
 			$('#orgContent').attr("src","${ctx}/workinvoice/workInvoice/workInvoiceImageEdit");
 
@@ -555,7 +561,7 @@
 									<input type="text" value="${list.projectName}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td>
-									<input type="text" value="${list.workContractName}" readonly="readonly"  class="form-control"/>
+									<input type="text" id="workContractInput"  style="color: #9e9e9e;text-align: center;" value="${list.workContractName}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td style="text-align:center;">
 									<input type="text" value="${list.projectNum}" readonly="readonly"  class="form-control"/>

src/main/webapp/webpage/modules/workinvoice/workInvoiceNotProjectModify.jsp

@@ -419,7 +419,7 @@
 				}
 			}
 			layui.form.render("select");
-			form.render();
+			layui.form.render();
 		}
         function setDp(obj){
             $.ajax({
@@ -1136,7 +1136,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6 count1">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行：</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<select id="bank" name="bank" value="${workInvoice.bank}" lay-filter="bankFilter"></select>
 						<span id="bankRemarks" class="spanzj" style="color:red;"></span>
 							<%--<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>--%>

src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoForm.jsp

@@ -514,7 +514,7 @@
 				}
 			}
 			layui.form.render("select");
-			form.render();
+			layui.form.render();
 		}
         function setDp(obj){
             $.ajax({
@@ -1270,7 +1270,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行：</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<select id="bank" name="bank" value="${workInvoice.bank}" lay-filter="bankFilter"></select>
 						<%--<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>--%>
 						<span id="bankRemarks" class="spanzj" style="color:red;"></span>

src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoModify.jsp

@@ -1081,7 +1081,7 @@
 				</div>
 				<div class="layui-item layui-col-sm6 count1">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>开户银行：</label>
-					<div class="layui-input-block">
+					<div class="layui-input-block readOnlyFFF">
 						<select id="bank" name="bank" value="${workInvoice.bank}" lay-filter="bankFilter"></select>
 						<span id="bankRemarks" class="spanzj" style="color:red;"></span>
 						<%--<form:input id ="bank"  path="bank" htmlEscape="false" placeholder="请输入开户银行"  class="form-control layui-input"/>--%>

src/main/webapp/webpage/modules/workinvoice/workInvoiceView.jsp

@@ -24,6 +24,12 @@
 		}
 		$(document).ready(function() {
 
+			const input = document.getElementById('workContractInput');
+			if (input.value !== '————————————') {
+				input.style.color = '';
+				input.style.textAlign = '';
+			}
+
 			layui.use('form', function () {
 				var form = layui.form;
 				form.render();
@@ -100,7 +106,7 @@
 									<input type="text" value="${list.projectName}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td>
-									<input type="text" value="${list.workContractName}" readonly="readonly"  class="form-control"/>
+									<input type="text" id="workContractInput"  style="color: #9e9e9e;text-align: center;" value="${list.workContractName}" readonly="readonly"  class="form-control"/>
 								</td>
 								<td style="text-align:center;">
 									<input type="text" value="${list.projectNum}" readonly="readonly"  class="form-control"/>