Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jeeplus/modules/centerservice/utils/RestTemplateService.java
#	src/main/java/com/jeeplus/modules/szCenterservice/utils/SzRestTemplateService.java

src/main/java/com/jeeplus/common/config/Global.java

@@ -320,6 +320,12 @@ public class Global {
 	 * 获取公共密码
 	 */
 	public static String getPublicPassword(){return getConfig("publicPassword");}
+
+	/**
+	 * 获取苏州公共密码
+	 */
+	public static String getSzPublicPassword(){return getConfig("szPublicPassword");}
+
 	/**
 	 * 在修改系统用户和岗位时是否同步到Activiti
 	 */

src/main/java/com/jeeplus/common/szCcpm/controller/CcpmList.java

@@ -5,28 +5,33 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
+import com.jeeplus.modules.projectVisa.entity.ProjectVisa;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.dao.OfficeDao;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientBankDao;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientInfoDao;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientLinkmanDao;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientBank;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.dao.WorkContractInfoDao;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
-@Controller
+@RestController
 @RequestMapping(value = "${adminPath}/ccpmList/ccpmList")
 public class CcpmList{
 
@@ -48,6 +53,9 @@ public class CcpmList{
     @Autowired
     private WorkClientBankDao workClientBankDao;
 
+    @Autowired
+    private WorkattachmentService workattachmentService;
+
 
     /**
      * 获取苏州分公司下的部门
@@ -69,6 +77,17 @@ public class CcpmList{
         //根据部门获取项目信息
         for (Office office : list) {
             List<RuralProjectRecords> projectRecords=projectRecordsService.getListByOffice(office.getId());
+            if (projectRecords != null){
+                for (RuralProjectRecords projectRecord : projectRecords) {
+                    if (null !=projectRecord){
+                        if(org.apache.commons.lang3.StringUtils.isNotBlank(projectRecord.getBelongingDepartment()) && "其他".equals(projectRecord.getBelongingDepartment())){
+                            projectRecord.setBelongingDepartmentName("其他");
+                        }
+                    }
+                    projectRecordsService.queryLinkmanInfos(projectRecord);
+                }
+            }
+
             maps.addAll(projectRecords);
         }
         return maps;
@@ -86,6 +105,19 @@ public class CcpmList{
         //根据部门获取合同信息
         for (Office office : list) {
             List<WorkContractInfo> projectRecords=workContractInfoDao.getListByOffice(office.getId());
+            for (WorkContractInfo projectRecord : projectRecords) {
+                //获取客户联系人信息
+                if (StringUtils.isNotBlank(projectRecord.getClient().getId())){
+                    List<WorkClientLinkman> clientId = workClientLinkmanDao.findByClientId(projectRecord.getClient().getId());
+                    if (clientId != null){
+                        projectRecord.getClient().setWorkClientLinkmanList(clientId);
+                    }
+                }
+                WorkClientAttachment workClientAttachment = new WorkClientAttachment();
+                workClientAttachment.setAttachmentId(projectRecord.getId());
+                workClientAttachment.setAttachmentFlag("44");
+                projectRecord.setWorkAttachments(workattachmentService.getAttachmentList(workClientAttachment));
+            }
             maps.addAll(projectRecords);
         }
         return maps;
@@ -97,16 +129,15 @@ public class CcpmList{
     public List<WorkClientInfo> getClient(){
         List<WorkClientInfo> clientInfoList=workClientInfoDao.getAllClient();
         //根据客户id查询客户的相关客户类型
-        for (WorkClientInfo clientInfo: clientInfoList) {
-            clientInfo.setJobTypeStr(workClientInfoDao.getJobTypeStr(clientInfo.getId()));
-            if (StringUtils.isBlank(clientInfo.getClientType())){
-                clientInfo.setClientType("");
-                clientInfo.setClientTypeLables("");
-            }
-        }
         if(clientInfoList!=null && clientInfoList.size()>0){
             for (int i = 0; i < clientInfoList.size(); i++) {
                 WorkClientInfo entity = clientInfoList.get(i);
+                entity.setCompanyIndustry(workClientInfoDao.getCompanyIndustryStr(entity.getId()));
+                if (StringUtils.isBlank(entity.getClientType())){
+                    entity.setClientType("");
+                    entity.setClientTypeLables("");
+                }
+                //客户联系人
                 List<WorkClientLinkman> linkmanList = workClientLinkmanDao.findList(new WorkClientLinkman(entity));
                 entity.setWorkClientLinkmanList(linkmanList);
                 if(linkmanList!=null && linkmanList.size()>0){
@@ -121,6 +152,11 @@ public class CcpmList{
                 }
                 List<WorkClientBank> bankList = workClientBankDao.findListByClient(new WorkClientBank(entity));
                 entity.setWorkClientBankList(bankList);
+                //附件
+                WorkClientAttachment attchment = new WorkClientAttachment();
+                attchment.setAttachmentId(entity.getId());
+                List<WorkClientAttachment> attachments = workattachmentService.getAttachmentList(attchment);
+                entity.setWorkAttachments(attachments);
             }
         }
         List<WorkClientInfo> maps = new ArrayList<>();
@@ -130,5 +166,11 @@ public class CcpmList{
     }
 
 
+    @RequestMapping("/checkConnect")
+    public ResponseEntity checkConnect() {
+        ResponseEntity<String> responseEntity = new ResponseEntity<>();
+        responseEntity.setMessage("success");
+        return responseEntity;
+    }
 
 }

src/main/java/com/jeeplus/modules/centerservice/config/ConnectionService.java

@@ -0,0 +1,70 @@
+package com.jeeplus.modules.centerservice.config;
+
+import com.jeeplus.common.config.Global;
+import com.jeeplus.common.utils.JedisUtils;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.sys.web.LoginController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.Model;
+import org.springframework.web.client.RestTemplate;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+@Service
+public class ConnectionService {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    private ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+    private boolean isConnected = false;
+
+    // 启动时调用，开始定期检查连接
+    public void startCheckingConnection() {
+        scheduler.scheduleAtFixedRate(this::checkConnection, 0, 5, TimeUnit.SECONDS);
+    }
+
+    private void checkConnection() {
+        try {
+            String path = Global.getConfig("SZOA_PATH");
+            String url = path+"/flowable/task/checkConnect";
+            ResponseEntity<Map<String, String>> responseEntity = restTemplate.exchange(url, HttpMethod.GET, null, new ParameterizedTypeReference<Map<String, String>>() {});
+            // 从 ResponseEntity 中获取 body
+            Map<String, String> responseBody = responseEntity.getBody();
+            String message = responseBody.get("message");
+            if ("success".equals(message)) {
+                if (!isConnected) {
+                    JedisUtils.set("connect", "true", 24);
+                    System.out.println("Connected successfully.");
+                }
+                isConnected = true; // 更新连接状态
+            }
+        } catch (Exception e) {
+            isConnected = false; // 连接失败，更新状态
+            JedisUtils.set("connect", "false", 24);
+            System.out.println("Connection failed: " + e.getMessage());
+        }
+    }
+
+    // 可选：停止检查连接的方法
+    public void stopCheckingConnection() {
+        if (scheduler != null) {
+            scheduler.shutdown(); // 停止调度
+        }
+    }
+}

src/main/java/com/jeeplus/modules/centerservice/config/StartupRunner.java

@@ -0,0 +1,33 @@
+package com.jeeplus.modules.centerservice.config;
+
+import javax.annotation.PostConstruct;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.support.SpringBeanAutowiringSupport;
+
+@WebListener
+public class StartupRunner implements ServletContextListener {
+
+    @Autowired
+    private ConnectionService connectionService;
+
+
+
+    @Override
+    public void contextInitialized(ServletContextEvent servletContextEvent) {
+        SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this);
+        connectionService.startCheckingConnection();
+        System.out.println("Connection check started on application startup.");
+    }
+
+    @Override
+    public void contextDestroyed(ServletContextEvent servletContextEvent) {
+        connectionService.stopCheckingConnection();
+        System.out.println("Connection check stopped on application shutdown.");
+    }
+}
+

src/main/java/com/jeeplus/modules/centerservice/utils/RestTemplateService.java

@@ -60,7 +60,7 @@ public class RestTemplateService {
             }
             String url = getUrl(hostAddress, path, paramMap);
             HttpHeaders httpHeaders = new HttpHeaders();
-            httpHeaders.add("token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3Mjk3NTMzMzIsInVzZXJuYW1lIjoiYWRtaW4ifQ.lArBO53lU3GlRwpG6q4g4fsXEZLEFWkgJUqB-pNbZ8k");
+            httpHeaders.add("token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MzAwOTM2MTcsInVzZXJuYW1lIjoiYWRtaW4ifQ.WcRZNiFKZrg7rzX-IUUIlw7xlELqNvWSRcEXZCrXWiM");
             httpHeaders.add("Accept", MediaType.ALL_VALUE);
             //        httpHeaders.add("cookie", "jeeplus.session.id=0635611b0f5a4401836262c7d23ae98e");
             httpHeaders.setContentType(new MediaType("application", "json", Charset.forName("UTF-8")));

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportData.java

@@ -131,7 +131,15 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private Date signatureUploadDate;		//签章文件上传时间
 	private Date firstAuditDate;  //质量复核初次审核时间
 	private String overReportStatus;  //是否超期
+	private String createName;
 
+	public String getCreateName() {
+		return createName;
+	}
+
+	public void setCreateName(String createName) {
+		this.createName = createName;
+	}
 
 	public String getUpId() {
 		return upId;

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportDataTwo.java

@@ -112,7 +112,15 @@ public class ProjectReportDataTwo extends ActEntity<ProjectReportDataTwo> {
 
 	private String contractCategory;	//报告合同类别
 	private String contractRate;	//合同费率
+	private String createName;
 
+	public String getCreateName() {
+		return createName;
+	}
+
+	public void setCreateName(String createName) {
+		this.createName = createName;
+	}
 
 	public String getUpId() {
 		return upId;

src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectReportRecordController.java

@@ -635,6 +635,7 @@ public class ProjectReportRecordController extends BaseController {
 			RuralProjectRecords records = new RuralProjectRecords();
 			records.setId(reportData.getProjectId());
 			records.setPrrId(reportData.getId());
+			records.setCreateName(reportData.getCreateBy().getName());
 			records.setProjectReportRecordStatus(Integer.parseInt(reportData.getStatus()));
 			HttpHeaders headers = new HttpHeaders();
 			String url = path + "/ccpmData/data/saveProjectReportOnline";

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -414,6 +414,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String internalAuditFlag;		//内审报告判定条件
 	private String beginSubmitScale;	//送审规模(开始)
 	private String endSubmitScale;	//送审规模（结束）
+	private String createName;
+
+	private String createNamePhone;
+	private String leaderNamePhone;
+	private String projectMasterPhone;
+
 
 
 	private List<String> civilProjectList = Lists.newArrayList();
@@ -422,6 +428,38 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private List<ProjectReportData> projectReportData = Lists.newArrayList();
 	private List<ProjectFilingBatchProInfo> proInfos=Lists.newArrayList();
 
+	public String getCreateNamePhone() {
+		return createNamePhone;
+	}
+
+	public void setCreateNamePhone(String createNamePhone) {
+		this.createNamePhone = createNamePhone;
+	}
+
+	public String getLeaderNamePhone() {
+		return leaderNamePhone;
+	}
+
+	public void setLeaderNamePhone(String leaderNamePhone) {
+		this.leaderNamePhone = leaderNamePhone;
+	}
+
+	public String getProjectMasterPhone() {
+		return projectMasterPhone;
+	}
+
+	public void setProjectMasterPhone(String projectMasterPhone) {
+		this.projectMasterPhone = projectMasterPhone;
+	}
+
+	public String getCreateName() {
+		return createName;
+	}
+
+	public void setCreateName(String createName) {
+		this.createName = createName;
+	}
+
 	public Integer getReminderCount() {
 		return reminderCount;
 	}

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

@@ -195,6 +195,7 @@ public class ProjectPaperFilingController extends BaseController {
             records.setId(paperFiling.getProjectId());
             records.setPrrdId(paperFiling.getId());
             records.setDownProjectReportRecordStatus(paperFiling.getStatus());
+            records.setCreateName(paperFiling.getCreateBy().getName());
             HttpHeaders headers = new HttpHeaders();
             String url = path + "/ccpmData/data/saveProjectReportPaper";
             HttpEntity<RuralProjectRecords> httpEntity = new HttpEntity<>(records, headers);

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

@@ -818,6 +818,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
             records.setPrdId(reportData.getId());
             records.setProjectReportStatus(Integer.parseInt(reportData.getStatus()));
             records.setProjectReportNumber(reportData.getNumber());
+            records.setCreateName(reportData.getCreateName());
+            records.setCreateDate(reportData.getCreateDate());
             HttpHeaders headers = new HttpHeaders();
             String url = path + "/ccpmData/data/saveProjectReview";
             HttpEntity<RuralProjectRecords> httpEntity = new HttpEntity<>(records, headers);

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

@@ -908,6 +908,7 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
             RuralProjectRecords records = new RuralProjectRecords();
             records.setId(reportData.getProjectId());
             records.setPrrId(reportData.getId());
+            records.setCreateName(reportData.getCreateBy().getName());
             records.setProjectReportRecordStatus(Integer.parseInt(reportData.getStatus()));
             HttpHeaders headers = new HttpHeaders();
             String url = path + "/ccpmData/data/saveProjectReportOnline";

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

@@ -562,7 +562,19 @@ public class RuralCostProjectRecordsController extends BaseController {
 			records.setProjectId(ruralProjectRecords.getProjectId());
 			records.setProjectName(ruralProjectRecords.getProjectName());
 			records.setProjectType(ruralProjectRecords.getProjectType());
+			records.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+			records.setSubmitMoney(ruralProjectRecords.getSubmitMoney());
+			records.setTotalFees(ruralProjectRecords.getTotalFees());
+			records.setStartDate(ruralProjectRecords.getStartDate());
+			records.setEndingDate(ruralProjectRecords.getEndingDate());
+			records.setEngineeringType(ruralProjectRecords.getEngineeringType());
+			records.setProjectMasterName(ruralProjectRecords.getProjectMasterName());
+			records.setWorkClientLinkmanList(ruralProjectRecords.getWorkClientLinkmanList());
+			records.setCreateNamePhone(ruralProjectRecords.getCreateNamePhone());
+			records.setProjectMasterPhone(ruralProjectRecords.getProjectMasterPhone());
 			records.setArea(ruralProjectRecords.getArea());
+			records.setCreateName(ruralProjectRecords.getCreateName());
+			records.setCreateDate(ruralProjectRecords.getCreateDate());
 			WorkContractInfo workContractInfo = new WorkContractInfo();
 			workContractInfo.setId(ruralProjectRecords.getWorkContractInfo().getId());
 			records.setWorkContractInfo(workContractInfo);

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

@@ -1059,6 +1059,8 @@ public class RuralProjectMessageNewController extends BaseController {
             records.setPrdId(reportData.getId());
             records.setProjectReportStatus(Integer.parseInt(reportData.getStatus()));
             records.setProjectReportNumber(reportData.getNumber());
+            records.setCreateName(reportData.getCreateName());
+            records.setCreateDate(reportData.getCreateDate());
             HttpHeaders headers = new HttpHeaders();
             String url = path + "/ccpmData/data/saveProjectReview";
             HttpEntity<RuralProjectRecords> httpEntity = new HttpEntity<>(records, headers);

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

@@ -450,6 +450,7 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
             RuralProjectRecords records = new RuralProjectRecords();
             records.setId(reportData.getProject().getId());
             records.setPrdtId(reportData.getId());
+            records.setCreateName(reportData.getCreateName());
             records.setProjectReportStatusTwo(Integer.parseInt(reportData.getStatus()));
             HttpHeaders headers = new HttpHeaders();
             String url = path + "/ccpmData/data/saveProjectReportTwo";

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

@@ -508,7 +508,19 @@ public class RuralProjectRecordsController extends BaseController {
 			records.setProjectId(ruralProjectRecords.getProjectId());
 			records.setProjectName(ruralProjectRecords.getProjectName());
 			records.setProjectType(ruralProjectRecords.getProjectType());
+			records.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+			records.setSubmitMoney(ruralProjectRecords.getSubmitMoney());
+			records.setTotalFees(ruralProjectRecords.getTotalFees());
+			records.setStartDate(ruralProjectRecords.getStartDate());
+			records.setEndingDate(ruralProjectRecords.getEndingDate());
+			records.setEngineeringType(ruralProjectRecords.getEngineeringType());
+			records.setProjectMasterName(ruralProjectRecords.getProjectMasterName());
+			records.setWorkClientLinkmanList(ruralProjectRecords.getWorkClientLinkmanList());
+			records.setCreateNamePhone(ruralProjectRecords.getCreateNamePhone());
+			records.setProjectMasterPhone(ruralProjectRecords.getProjectMasterPhone());
 			records.setArea(ruralProjectRecords.getArea());
+			records.setCreateName(ruralProjectRecords.getCreateName());
+			records.setCreateDate(ruralProjectRecords.getCreateDate());
 			WorkContractInfo workContractInfo = new WorkContractInfo();
 			workContractInfo.setId(ruralProjectRecords.getWorkContractInfo().getId());
 			records.setWorkContractInfo(workContractInfo);

src/main/java/com/jeeplus/modules/sys/web/LoginController.java

@@ -55,6 +55,7 @@ import com.jeeplus.modules.workcalendar.service.WorkCalendarService;
 import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import net.sf.json.JSONArray;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -634,37 +635,71 @@ public class LoginController extends BaseController{
 			workProjectNotifyPage.setPageSize(10);
 			// 查询中台待办数据
 			List<WorkProjectNotify> notifyList = centerCpaTaskService.getNotifyList(workProjectNotify);
-			//苏州分公司cloud数据
-			List<Map<String, Object>> result = new ArrayList<>();
-			Object sz = szFlowRequest.getNotifyList(workProjectNotify, "sz", user);
-			List<Map<String, Object>> res = (List) JSONObject.parseArray(JSON.toJSONString(sz));
-			result.addAll((List) JSON.parseArray(JSON.toJSONString(res)));
-			List<WorkProjectNotify> processVos = SzConvertServiceUtil.convertWorkProjectNotifyList(result);
-			if (processVos.size()>0){
-				Page<WorkProjectNotify> notifyPage = workProjectNotifyService.findPage(new Page<WorkProjectNotify>(1, 10), workProjectNotify);
-				List<WorkProjectNotify> list = notifyPage.getList();
-				processVos.addAll(list);
-				disposePageResp(processVos); // 查询结果处理
-				workProjectNotifyPage.getList().addAll(processVos);
-				Page<WorkProjectNotify> resultPage = ConvertServiceUtil.getSortAndPaging(workProjectNotifyPage, workProjectNotifyPage.getList());
-				model.addAttribute("notifyPage", resultPage.getList());
-				model.addAttribute("notifyCount", workProjectNotifyPage.getList().size());//未读通知条数
-				model.addAttribute("notifyCount1", workProjectNotifyPage.getCount());//未读通知条数
-			} else if (notifyList.size() > 0) {
-				disposePageResp(notifyList); // 查询结果处理
-				workProjectNotifyPage.getList().addAll(notifyList);
-				Page<WorkProjectNotify> resultPage = ConvertServiceUtil.getSortAndPaging(workProjectNotifyPage, workProjectNotifyPage.getList());
-				model.addAttribute("notifyPage", resultPage.getList());
-				model.addAttribute("notifyCount", workProjectNotifyPage.getList().size());//未读通知条数
-				model.addAttribute("notifyCount1", workProjectNotifyPage.getCount());//未读通知条数
-			} else {
-				// 中台没有查询到待办时，查询本系统待办分页数据
-				Page<WorkProjectNotify> notifyPage = workProjectNotifyService.findPage(new Page<WorkProjectNotify>(1, 10), workProjectNotify);
-				disposePageResp(notifyPage.getList()); // 查询结果处理
-				model.addAttribute("notifyPage", notifyPage.getList());
-				model.addAttribute("notifyCount", notifyPage.getList().size());//未读通知条数
-				model.addAttribute("notifyCount1", notifyPage.getCount());//未读通知条数
+			if (CollectionUtils.isEmpty(notifyList)){
+				String connect = JedisUtils.get("connect");
+				if (StringUtils.isNotBlank(connect) && connect.equals("true")){
+					//苏州分公司cloud数据
+					List<Map<String, Object>> result = new ArrayList<>();
+					Object sz = szFlowRequest.getNotifyList(workProjectNotify, "sz", user);
+					List<Map<String, Object>> res = (List) JSONObject.parseArray(JSON.toJSONString(sz));
+					if (res != null){
+						result.addAll((List) JSON.parseArray(JSON.toJSONString(res)));
+						List<WorkProjectNotify> processVos = SzConvertServiceUtil.convertWorkProjectNotifyList(result);
+						if (processVos.size()>0){
+							Page<WorkProjectNotify> notifyPage = workProjectNotifyService.findPage(new Page<WorkProjectNotify>(1, 10), workProjectNotify);
+							List<WorkProjectNotify> list = notifyPage.getList();
+							processVos.addAll(list);
+							disposePageResp(processVos); // 查询结果处理
+							workProjectNotifyPage.getList().addAll(processVos);
+							Page<WorkProjectNotify> resultPage = ConvertServiceUtil.getSortAndPaging(workProjectNotifyPage, workProjectNotifyPage.getList());
+							model.addAttribute("notifyPage", resultPage.getList());
+							model.addAttribute("notifyCount", workProjectNotifyPage.getList().size());//未读通知条数
+							model.addAttribute("notifyCount1", workProjectNotifyPage.getCount());//未读通知条数
+						}else {
+							// 中台没有查询到待办时，查询本系统待办分页数据
+							Page<WorkProjectNotify> notifyPage = workProjectNotifyService.findPage(new Page<WorkProjectNotify>(1, 10), workProjectNotify);
+							disposePageResp(notifyPage.getList()); // 查询结果处理
+							model.addAttribute("notifyPage", notifyPage.getList());
+							model.addAttribute("notifyCount", notifyPage.getList().size());//未读通知条数
+							model.addAttribute("notifyCount1", notifyPage.getCount());//未读通知条数
+						}
+					} else {
+						// 本系统待办分页数据查询
+						Page<WorkProjectNotify> notifyPage = workProjectNotifyService.findPage(new Page<WorkProjectNotify>(1, 10), workProjectNotify);
+						disposePageResp(notifyPage.getList()); // 查询结果处理
+						model.addAttribute("notifyPage", notifyPage.getList());
+						model.addAttribute("notifyCount", notifyPage.getList().size());//未读通知条数
+						model.addAttribute("notifyCount1", notifyPage.getCount());//未读通知条数
+					}
+				}else {
+					// 本系统待办分页数据查询
+					Page<WorkProjectNotify> notifyPage = workProjectNotifyService.findPage(new Page<WorkProjectNotify>(1, 10), workProjectNotify);
+					disposePageResp(notifyPage.getList()); // 查询结果处理
+					model.addAttribute("notifyPage", notifyPage.getList());
+					model.addAttribute("notifyCount", notifyPage.getList().size());//未读通知条数
+					model.addAttribute("notifyCount1", notifyPage.getCount());//未读通知条数
+				}
+
+			}else {
+				if (notifyList.size() > 0) {
+					disposePageResp(notifyList); // 查询结果处理
+					workProjectNotifyPage.getList().addAll(notifyList);
+					Page<WorkProjectNotify> resultPage = ConvertServiceUtil.getSortAndPaging(workProjectNotifyPage, workProjectNotifyPage.getList());
+					model.addAttribute("notifyPage", resultPage.getList());
+					model.addAttribute("notifyCount", workProjectNotifyPage.getList().size());//未读通知条数
+					model.addAttribute("notifyCount1", workProjectNotifyPage.getCount());//未读通知条数
+				}else {
+					// 本系统待办分页数据查询
+					Page<WorkProjectNotify> notifyPage = workProjectNotifyService.findPage(new Page<WorkProjectNotify>(1, 10), workProjectNotify);
+					disposePageResp(notifyPage.getList()); // 查询结果处理
+					model.addAttribute("notifyPage", notifyPage.getList());
+					model.addAttribute("notifyCount", notifyPage.getList().size());//未读通知条数
+					model.addAttribute("notifyCount1", notifyPage.getCount());//未读通知条数
+				}
+
 			}
+
+
 		} else {
 			// 本系统待办分页数据查询
 			Page<WorkProjectNotify> notifyPage = workProjectNotifyService.findPage(new Page<WorkProjectNotify>(1, 10), workProjectNotify);

src/main/java/com/jeeplus/modules/szCenterservice/controller/szCloud/CpaFinanceInvoiceController.java

@@ -33,15 +33,20 @@ public class CpaFinanceInvoiceController {
     public String saveAudit(WorkInvoice workInvoice, RedirectAttributes redirectAttributes) throws ParseException {
         if (Objects.nonNull(workInvoice.getAct())) {
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-            Date parse = simpleDateFormat.parse(workInvoice.getInvoiceDateCpa());
-            workInvoice.setInvoiceDate(parse);
-            Date parse1 = simpleDateFormat.parse(workInvoice.getTakeDateCpa());
-            workInvoice.setTakeDate(parse1);
+            if (StringUtils.isNotBlank(workInvoice.getInvoiceDateCpa())){
+                Date parse = simpleDateFormat.parse(workInvoice.getInvoiceDateCpa());
+                workInvoice.setInvoiceDate(parse);
+            }
+            if (StringUtils.isNotBlank(workInvoice.getTakeDateCpa())){
+                Date parse1 = simpleDateFormat.parse(workInvoice.getTakeDateCpa());
+                workInvoice.setTakeDate(parse1);
+            }
             Object res = financeInvoiceRequest.auditFunc(workInvoice);
-            if (Objects.nonNull(res)) {
+            if (res.toString().contains("成功")) {
+                addMessage(redirectAttributes, "审核成功");
+            }else {
                 addMessage(redirectAttributes, "操作失败");
             }
-            addMessage(redirectAttributes, "审核成功");
         } else {
             addMessage(redirectAttributes, "操作失败");
         }

src/main/java/com/jeeplus/modules/szCenterservice/service/szCloud/FinanceInvoiceRequest.java

@@ -51,6 +51,7 @@ public class FinanceInvoiceRequest {
      * @return
      */
     public Object auditFunc(WorkInvoice workInvoice) {
+        Object res = null;
         Map<String, Object> bodyMap = new HashMap<>();
         bodyMap.put("id", workInvoice.getId());
         bodyMap.put("flag", workInvoice.getAct().getFlag());
@@ -71,7 +72,8 @@ public class FinanceInvoiceRequest {
             headers.add("domain", "127.0.0.17");
             headers.setContentType(new MediaType("application", "json", Charset.forName("UTF-8")));
             HttpEntity<Object> httpEntity = new HttpEntity<>(bodyMap, headers);
-            Object res = restTemplate.exchange(url, HttpMethod.POST, httpEntity, Object.class);
+            ResponseEntity<Object> responseEntity = restTemplate.exchange(url, HttpMethod.POST, httpEntity, Object.class);
+            res = responseEntity.getBody();
             return res;
         }
         return "";

src/main/java/com/jeeplus/modules/szCenterservice/utils/SzRestTemplateService.java

@@ -8,6 +8,8 @@ import com.jeeplus.common.config.Global;
 import com.jeeplus.common.utils.StringUtils;
 
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.wexinpackage.access.util.access.AccessTokenUtil;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +18,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -33,6 +36,9 @@ public class SzRestTemplateService {
     @Autowired
     private RestTemplate restTemplate;
 
+    @Autowired
+    private HttpServletRequest request;
+
     /**
      * 访问post接口 - CPA 系统
      * @param path 接口路径
@@ -122,7 +128,7 @@ public class SzRestTemplateService {
         //推荐的数据存储方式,类似key-value形式
         Map telPair = new HashMap();
         telPair.put("loginName",user.getName());
-        telPair.put("password",Global.getPublicPassword());
+        telPair.put("password",Global.getSzPublicPassword());
         //封装请求参数
         postMethod.setRequestBody(telPair.toString());
         //这里是设置请求内容为json格式,根据站点的格式决定
@@ -165,7 +171,7 @@ public class SzRestTemplateService {
         //封装请求参数
         User user1 = new User();
         user1.setUsername(user.getName());
-        user1.setPassword(Global.getPublicPassword());
+        user1.setPassword(Global.getSzPublicPassword());
         postMethod.setRequestBody(JSONObject.toJSONString(user1));
         //这里是设置请求内容为json格式,根据站点的格式决定
         postMethod.setRequestHeader("domain","127.0.0.17");
@@ -207,7 +213,8 @@ public class SzRestTemplateService {
             }
             String url = getUrl(hostAddress, path, paramMap);
             HttpHeaders httpHeaders = new HttpHeaders();
-            httpHeaders.add("token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3Mjk3NTMzMzIsInVzZXJuYW1lIjoiYWRtaW4ifQ.lArBO53lU3GlRwpG6q4g4fsXEZLEFWkgJUqB-pNbZ8k");
+            String header = request.getHeader("token");
+            httpHeaders.add("token", header);
             httpHeaders.add("Accept", MediaType.ALL_VALUE);
             //        httpHeaders.add("cookie", "jeeplus.session.id=0635611b0f5a4401836262c7d23ae98e");
             httpHeaders.setContentType(new MediaType("application", "json", Charset.forName("UTF-8")));

src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientInfoDao.java

@@ -55,6 +55,13 @@ public interface WorkClientInfoDao extends CrudDao<WorkClientInfo> {
     String getJobTypeStr(String clientId);
 
     /**
+     * 查询所在行业
+     * @param clientId
+     * @return
+     */
+    String getCompanyIndustryStr(String clientId);
+
+    /**
      * 根据用户编码查询用户信息
      * @param name
      * @return

src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientInfo.java

@@ -89,6 +89,15 @@ public class WorkClientInfo extends DataEntity<WorkClientInfo> {
 
 	private Date beginDate;
 	private Date endDate;
+	private String createMobile;
+
+	public String getCreateMobile() {
+		return createMobile;
+	}
+
+	public void setCreateMobile(String createMobile) {
+		this.createMobile = createMobile;
+	}
 
 	public WorkClientInfo() {
 		super();

src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoAllService.java

@@ -893,4 +893,13 @@ public class WorkClientInfoAllService extends CrudService<WorkClientInfoDao, Wor
         }
         return workClientInfo;
     }
+
+    /**
+     * 获取所在行业
+     * @param id
+     * @return
+     */
+    public String getCompanyIndustryStr(String id) {
+        return workClientInfoDao.getCompanyIndustryStr(id);
+    }
 }

src/main/java/com/jeeplus/modules/workclientinfo/service/WorkClientInfoService.java

@@ -920,4 +920,13 @@ public class WorkClientInfoService extends CrudService<WorkClientInfoDao, WorkCl
         }
         return workClientInfo;
     }
+
+    /**
+     * 获取所在行业
+     * @param id
+     * @return
+     */
+    public String getCompanyIndustryStr(String id) {
+        return workClientInfoDao.getCompanyIndustryStr(id);
+    }
 }

src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoAllController.java

@@ -239,12 +239,16 @@ public class WorkClientInfoAllController extends BaseController {
 			WorkClientInfo info = new WorkClientInfo();
 			info.setId(workClientInfo.getId());
 			info.setName(workClientInfo.getName());
+			info.setUserName(workClientInfo.getUserName());
 			info.setHasUscc(workClientInfo.getHasUscc());
 			info.setUscCode(workClientInfo.getUscCode());
 			info.setRegisterAddress(workClientInfo.getRegisterAddress());
 			info.setTelephone(workClientInfo.getTelephone());
-			info.setCompanyIndustry(workClientInfo.getCompanyIndustry());
+			info.setCompanyIndustry(workClientInfoService.getCompanyIndustryStr(workClientInfo.getId()));
 			info.setWorkClientBankList(workClientInfo.getWorkClientBankList());
+			info.setWorkClientLinkmanList(workClientInfo.getWorkClientLinkmanList());
+			info.setWorkAttachments(workClientInfo.getWorkAttachments());
+			info.setCreateMobile(workClientInfo.getCreateMobile());
 			HttpHeaders headers = new HttpHeaders();
 			String url = path + "/ccpmData/data/saveClient";
 			HttpEntity<WorkClientInfo> httpEntity = new HttpEntity<>(info, headers);

src/main/java/com/jeeplus/modules/workclientinfo/web/WorkClientInfoController.java

@@ -263,10 +263,14 @@ public class WorkClientInfoController extends BaseController {
 			info.setName(workClientInfo.getName());
 			info.setHasUscc(workClientInfo.getHasUscc());
 			info.setUscCode(workClientInfo.getUscCode());
+			info.setUserName(workClientInfo.getUserName());
 			info.setRegisterAddress(workClientInfo.getRegisterAddress());
 			info.setTelephone(workClientInfo.getTelephone());
-			info.setCompanyIndustry(workClientInfo.getCompanyIndustry());
+			info.setCompanyIndustry(workClientInfoService.getCompanyIndustryStr(workClientInfo.getId()));
 			info.setWorkClientBankList(workClientInfo.getWorkClientBankList());
+			info.setWorkClientLinkmanList(workClientInfo.getWorkClientLinkmanList());
+			info.setWorkAttachments(workClientInfo.getWorkAttachments());
+			info.setCreateMobile(workClientInfo.getCreateMobile());
 			HttpHeaders headers = new HttpHeaders();
 			String url = path + "/ccpmData/data/saveClient";
 			HttpEntity<WorkClientInfo> httpEntity = new HttpEntity<>(info, headers);

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -185,6 +185,15 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private String chargeType;     //开票收款类型
 	private String chargeTypeStr;     //开票收款类型Str
 	private String isProject;     //是否关联项目（0：否；1：是）
+	private String createUserMobile;
+
+	public String getCreateUserMobile() {
+		return createUserMobile;
+	}
+
+	public void setCreateUserMobile(String createUserMobile) {
+		this.createUserMobile = createUserMobile;
+	}
 
 	public String getBeginInvestmentAmount() {
 		return beginInvestmentAmount;

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -1205,7 +1205,8 @@ public class WorkContractInfoController extends BaseController {
             info.setId(contractInfo.getId());
             info.setName(contractInfo.getName());
             info.setRecordNum(contractInfo.getFileNum());
-
+            info.setCreateUser(contractInfo.getCreateBy().getName());
+            info.setCreateUserMobile(contractInfo.getCreateUserMobile());
             WorkClientInfo workClientInfo = new WorkClientInfo();
             workClientInfo.setId(contractInfo.getClient().getId());
             info.setClient(workClientInfo);
@@ -1213,7 +1214,7 @@ public class WorkContractInfoController extends BaseController {
             info.setContractState(contractInfo.getContractState());
             info.setRecordNum(contractInfo.getFileNum());
             info.setContractRecordState(contractInfo.getContractRecordState());
-
+            info.setWorkAttachments(contractInfo.getWorkAttachments());
             HttpHeaders headers = new HttpHeaders();
             String url = path+"/ccpmData/data/saveContractInfo";
             HttpEntity<WorkContractInfo> httpEntity = new HttpEntity<>(info,headers);

src/main/java/com/jeeplus/modules/workcontractrecord/web/WorkContractRecordController.java

@@ -227,14 +227,15 @@ public class WorkContractRecordController extends BaseController {
 			info.setId(contractInfo.getId());
 			info.setName(contractInfo.getName());
 			info.setRecordNum(contractInfo.getFileNum());
-
+			info.setCreateUser(contractInfo.getCreateBy().getName());
 			WorkClientInfo workClientInfo = new WorkClientInfo();
 			workClientInfo.setId(contractInfo.getClient().getId());
 			info.setClient(workClientInfo);
-
+			info.setCreateUserMobile(contractInfo.getCreateUserMobile());
 			info.setContractState(contractInfo.getContractState());
 			info.setRecordNum(contractInfo.getFileNum());
 			info.setContrractRecordStatus(contractInfo.getContrractRecordStatus());
+			info.setWorkAttachments(contractInfo.getWorkAttachments());
 
 			HttpHeaders headers = new HttpHeaders();
 			String url = path + "/ccpmData/data/saveContractInfo";

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataTwoDao.xml

@@ -791,9 +791,11 @@
 		SELECT
 			<include refid="projectReportDataColumns"/>
 			,a.bzshb_user_id as "bzshbUserId"
+			,su.name as "createName"
 		FROM
 			rural_project_records r
 				LEFT JOIN project_report_data_two a on a.project_id=r.id and a.del_flag = 0
+			left join sys_user su on su.id = a.create_by
 		where
 			r.id=#{projectId}
 

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -262,7 +262,9 @@
 		SELECT
 		<include refid="projectReportDataColumns"/>
 		,a.bzshb_user_id as "bzshbUserId"
+		,su.name as "createName"
 		from project_report_data a
+		LEFT JOIN sys_user su ON su.id = a.create_by
 		where a.project_id = #{projectId}
 	</select>
 	<sql id="projectReportDataColumnsTwo">

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -6768,6 +6768,9 @@ GROUP BY
 		<include refid="newProjectRecordsColumns"/>
 		,concat(ifnull( pfp.STATUS, 0 ),ifnull( ppf.STATUS, 0 )) as "downProjectReportRecordPaperFilingStatus"
 		,su.name as "leaderNameStr"
+		,su.mobile as "leaderNamePhone"
+		,sua.name as "createName"
+		,sua.mobile as "createNamePhone"
 		,su.id as "leaderNameIds"
 		,a.submit_money as "submitMoney"
 		,a.project_type as projectType,
@@ -6807,6 +6810,12 @@ GROUP BY
 		,if(case_status > 0 ,case_status,"0") as "caseStatus"
 		,ifnull(prrd.status,0) as "downProjectReportRecordStatus"
 		,prrd.id as "prrdId"
+		,so.name as "belongingDepartmentName"
+		,a.engineering_type as "engineeringType"
+		,supmi.name as "projectMasterName"
+		,supmi.mobile as "projectMasterPhone"
+		,a.start_date as "startDate"
+		,a.ending_date as "endDate"
 		FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		left join rural_project_records_reported rprr on rprr.id = a.id
@@ -6833,15 +6842,26 @@ GROUP BY
 		LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id
 		left join project_paper_filing ppf on ppf.project_id = a.id
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
+		left join sys_office so on so.id = a.belonging_department
+		LEFT JOIN sys_user supmi ON supmi.id = a.project_master_id
 		where a.office_id = #{officeId} and a.del_flag = '0'
 	</select>
 	<select id="findUseableByProjectName" resultType="RuralProjectRecords">
 		select
 		<include refid="projectRecordsColumns"/>
 		,prd.number AS "projectReportNumber"
+		,sua.name as "createName"
+		,sua.mobile as "createNamePhone"
+		,a.engineering_type as "engineeringType"
+		,supmi.name as "projectMasterName"
+		,supmi.mobile as "projectMasterPhone"
+		,a.start_date as "startDate"
+		,a.ending_date as "endDate"
 		FROM rural_project_records a
 		left join project_report_data prd on prd.project_id = a.id
+		LEFT JOIN sys_user sua on a.create_by = sua.id
 		<include refid="projectRecordsJoins"/>
+		LEFT JOIN sys_user supmi ON supmi.id = a.project_master_id
 		WHERE a.project_name = #{projectName}
 	</select>
 

src/main/resources/mappings/modules/workclientinfo/WorkClientInfoDao.xml

@@ -165,6 +165,7 @@
 		SELECT
 		<include refid="workClientInfoColumns"/>
 		,su.name as "userName"
+		,su.mobile as "createMobile"
 		FROM work_client_info a
 		<include refid="workClientInfoJoinsLink"/>
 		left join sys_user su on su.id = a.create_by
@@ -729,13 +730,24 @@
 
 	</select>
 
+	<select id="getCompanyIndustryStr" resultType="java.lang.String">
+		select group_concat(md.detail_name) as "jobTypeStr"
+		from work_client_info a
+		left join main_dict_detail md on md.detail_key = a.company_industry
+		left join main_dict c on md.type_id = c.id
+		where md.del_flag = 0 and c.type_name = 'company_industry' and a.id = #{clientId}
+	</select>
+
 
 
 	<select id="getByName" resultType="WorkClientInfo" >
 		SELECT
-		<include refid="workClientInfoColumns"/>
+		<include refid="workClientInfoColumns"/>,
+		su.name as "userName",
+		su.mobile as "createMobile"
 		FROM work_client_info a
 		<include refid="workClientInfoJoins"/>
+		LEFT join sys_user as su on  a.create_by=su.id
 		WHERE a.name = #{name}
 		order by a.id
 		limit 1

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -381,6 +381,7 @@
 		distinct a.id AS "id",
 		u.name AS "createBy.name",
 		u.name AS "createUser",
+		u.mobile AS "createUserMobile",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
@@ -1502,6 +1503,7 @@
 		a.project_id AS "project.id",
 		a.ext AS  "ext",
 		u.name AS "createBy.name",
+		u.mobile AS "createUserMobile",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",

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

@@ -674,15 +674,15 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">开票时间：</label>
 				<div class="layui-input-block">
-					<input readonly="true" class="form-control layer-date laydate-icon layui-input laydate-icondate" id="invoiceDate" name="invoiceDateCpa" value="<fmt:formatDate
+					<input disabled readonly="true" style="background-color: #f1f1f1" class="form-control layer-date laydate-icon layui-input laydate-icondate" id="invoiceDate" name="invoiceDateCpa" value="<fmt:formatDate
 							value="${workInvoice.invoiceDate}" pattern="yyyy-MM-dd"/>">
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label">领票时间：</label>
 				<div class="layui-input-block">
-					<input readonly="true" placeholder="请选择领票时间" class="form-control layer-date laydate-icon layui-input laydate-icondate" id="takeDate" name="takeDateCpa" value="<fmt:formatDate
-							value="${workInvoice.takeDate}" pattern="yyyy-MM-dd"/>">
+					<input disabled readonly="true" style="background-color: #f1f1f1" placeholder="请选择领票时间" class="form-control layer-date laydate-icon layui-input laydate-icondate" id="takeDate" name="takeDateCpa" value="<fmt:formatDate
+							value="${workInvoice.takeDate}"  pattern="yyyy-MM-dd"/>">
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">