部分功能修改

src/main/java/com/jeeplus/modules/pojectMaterialsWarehouse/web/PojectMaterialsWarehouseAllController.java

@@ -5,7 +5,6 @@ import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.pojectMaterialsWarehouse.entity.ProjectMaterialCollectInfo;
 import com.jeeplus.modules.pojectMaterialsWarehouse.service.ProjectMaterialCollectService;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -34,8 +33,8 @@ public class PojectMaterialsWarehouseAllController extends BaseController {
     private ProjectRecordsService projectRecordsService;
     @Autowired
     protected HistoryService historyService;
-    @Autowired
-    private ProjectcontentinfoService projectcontentinfoService;
+   /* @Autowired
+    private ProjectcontentinfoService projectcontentinfoService;*/
     @Autowired
     private ProjectMaterialCollectService projectMaterialCollectService;
 
@@ -76,13 +75,13 @@ public class PojectMaterialsWarehouseAllController extends BaseController {
             project.setId(record.getId());
             select.setParentIds("0,");
             select.setProject(project);
-            List<Projectcontentinfo> p = projectcontentinfoService.findListByProject(select);
+            /*List<Projectcontentinfo> p = projectcontentinfoService.findListByProject(select);
             //添加工作内容id
             if(p.size()>0){
                 record.setContentPId(p.get(0).getId());
                 record.setParentIds("0,");
                 record.setDictType("");
-            }
+            }*/
         }
         model.addAttribute("page", page);
         return "modules/pojectMaterialsWarehouse/projectMaterialsWarehouseAllList";

src/main/java/com/jeeplus/modules/pojectMaterialsWarehouse/web/PojectMaterialsWarehouseController.java

@@ -2,7 +2,6 @@ package com.jeeplus.modules.pojectMaterialsWarehouse.web;
 
 import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
-import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
@@ -11,20 +10,21 @@ import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.pojectMaterialsWarehouse.entity.ProjectMaterialCollectInfo;
 import com.jeeplus.modules.pojectMaterialsWarehouse.service.ProjectMaterialCollectService;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
-import com.jeeplus.modules.workmaterialcollect.entity.WorkMaterialCollectTotal;
 import com.jeeplus.modules.workmaterialcollect.entity.WorkMaterialCollectType;
 import org.activiti.engine.HistoryService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
@@ -47,8 +47,8 @@ public class PojectMaterialsWarehouseController extends BaseController {
     private ProjectRecordsService projectRecordsService;
     @Autowired
     protected HistoryService historyService;
-    @Autowired
-    private ProjectcontentinfoService projectcontentinfoService;
+    /*@Autowired
+    private ProjectcontentinfoService projectcontentinfoService;*/
     @Autowired
     private ProjectMaterialCollectService projectMaterialCollectService;
 
@@ -89,13 +89,13 @@ public class PojectMaterialsWarehouseController extends BaseController {
             project.setId(record.getId());
             select.setParentIds("0,");
             select.setProject(project);
-            List<Projectcontentinfo> p = projectcontentinfoService.findListByProject(select);
+            /*List<Projectcontentinfo> p = projectcontentinfoService.findListByProject(select);
             //添加工作内容id
             if(p.size()>0){
                 record.setContentPId(p.get(0).getId());
                 record.setParentIds("0,");
                 record.setDictType("");
-            }
+            }*/
         }
         model.addAttribute("page", page);
         return "modules/pojectMaterialsWarehouse/projectMaterialsWarehouseList";

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectcontentinfoService.java

@@ -17,8 +17,8 @@ import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
 import com.jeeplus.modules.projectcontentinfo.entity.*;
 import com.jeeplus.modules.projectcontroltable.dao.ProjectControlTableDao;
 import com.jeeplus.modules.projectcontroltable.entity.ProjectControlTable;
-import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.entity.ProjectAttachmentInfo;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.service.ProjectImplementEarlyService;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.projectreportnum.service.ProjectReportNumService;
@@ -33,9 +33,10 @@ import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workactivity.service.WorkActivityProcessService;
 import com.jeeplus.modules.workcontent.common.WorkContentDetailFactory;
 import com.jeeplus.modules.workcontent.dao.WorkContentClaimDao;
-import com.jeeplus.modules.workcontent.dao.WorkContentContractinfoDao;
 import com.jeeplus.modules.workcontent.dao.WorkContentInvestmentCostDao;
-import com.jeeplus.modules.workcontent.entity.*;
+import com.jeeplus.modules.workcontent.entity.WorkContentClaim;
+import com.jeeplus.modules.workcontent.entity.WorkContentContractSum;
+import com.jeeplus.modules.workcontent.entity.WorkContentType;
 import com.jeeplus.modules.workcontent.service.WorkContentContractSumService;
 import com.jeeplus.modules.workcontent.service.WorkContentDetailBaseService;
 import com.jeeplus.modules.workcontent.service.WorkContentTypeService;
@@ -45,6 +46,7 @@ import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
 import com.jeeplus.modules.workreview.entity.WorkReviewStandard;
 import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -57,6 +59,7 @@ import java.util.*;
  * @version 2018-06-04
  */
 @Service
+@Lazy
 @Transactional(readOnly = true)
 public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao, Projectcontentinfo> {
 	@Autowired
@@ -100,8 +103,6 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 	@Autowired
 	private WorkContentClaimDao workContentClaimDao;
 	@Autowired
-	private WorkContentContractinfoDao workContentContractinfoDao;
-	@Autowired
 	private ProjectImplementEarlyService projectImplementEarlyService;
 	@Autowired
 	private WorkattachmentService workattachmentService;

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectMessageDao.java

@@ -164,4 +164,7 @@ public interface RuralProjectMessageDao extends CrudDao<RuralProjectRecords> {
      * @return
      */
 //    Integer findKaiPiao(RuralProjectRecords ruralProjectRecords);
+
+
+    Projectcontentinfo getByProjectId(String projectId);
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageElectronicSealService.java

@@ -1,6 +1,5 @@
 package com.jeeplus.modules.ruralprojectrecords.service;
 
-import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.jeeplus.common.config.Global;
@@ -16,7 +15,6 @@ import com.jeeplus.modules.ruralprojectrecords.entity.*;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.thread.ApprovalThread;
 import com.jeeplus.modules.ruralprojectrecords.thread.SignatureThread;
-import com.jeeplus.modules.ruralprojectrecords.utils.FileUtil;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
@@ -26,7 +24,6 @@ import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import com.jeeplus.modules.tools.utils.SignaturePostUtil;
 import com.jeeplus.modules.tools.utils.TwoDimensionCode;
 import com.jeeplus.modules.utils.SftpClientUtil;
 import com.jeeplus.modules.workactivity.dao.WorkActivityProcessDao;
@@ -93,8 +90,6 @@ public class RuralProjectMessageElectronicSealService extends CrudService<RuralP
     @Autowired
     private RuralProjectMessageNewService ruralProjectMessageNewService;
     @Autowired
-    private RuralProjectMessageService ruralProjectMessageService;
-    @Autowired
     private ProjectReportDataService projectReportDataService;
     @Autowired
     private RuralProjectRecordsService ruralProjectRecordsService;

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewService.java

@@ -30,7 +30,6 @@ import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectContentDataService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.projectrecord.dao.ProjectPlanDao;
 import com.jeeplus.modules.projectrecord.entity.ProjectPlanInfo;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
@@ -92,6 +91,7 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -110,6 +110,7 @@ import java.util.*;
  * @version 2020-04-15
  */
 @Service
+@Lazy
 @Transactional(readOnly = true)
 public class RuralProjectMessageNewService extends CrudService<RuralProjectMessageDao, RuralProjectRecords> {//AES 对称加密公钥
     private static final String AES_KEY = "63304b5db43265c103ebe576d38bd9f8";
@@ -119,6 +120,8 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
     @Autowired
     private RuralWorkProjectUserDao workProjectUserDao;
     @Autowired
+    private RuralProjectMessageDao ruralProjectMessageDao;
+    @Autowired
     private WorkClientLinkmanDao workClientLinkmanDao;
     @Autowired
     protected HistoryService historyService;
@@ -177,8 +180,6 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
     @Autowired
     private HistoricalService historicalService;
     @Autowired
-    private ProjectcontentinfoService projectcontentinfoService;
-    @Autowired
     private ProjectTemplateService projectTemplateService;
     @Autowired
     private SubProjectInfoService subProjectInfoService;
@@ -198,8 +199,6 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
     private ProjectTemplateDao projectTemplateDao;
     @Autowired
     private ProjectPlanDao projectPlanDao;
-    @Autowired
-    private RuralProjectMessageService ruralProjectMessageService;
 
     private static byte[] SYN_BYTE = new byte[0];
 
@@ -224,7 +223,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         return super.findList(projectRecords);
     }
     public List<RuralProjectRecords> findListByStatus(RuralProjectRecords projectRecords) {
-        return dao.findListByStatus(projectRecords);
+        return ruralProjectMessageDao.findListByStatus(projectRecords);
     }
 
     public Page<RuralProjectRecords> findPage(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords) {
@@ -248,7 +247,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
             projectRecords.setEndingCount(endingCount);
         }
 
-        int count = dao.queryCount(projectRecords);
+        int count = ruralProjectMessageDao.queryCount(projectRecords);
         page.setCount(count);
         page.setCountFlag(false);
         projectRecords.setPage(page);
@@ -791,7 +790,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         if(com.jeeplus.common.utils.StringUtils.isNotBlank(num)){
             projectReportNumService.updateNum(num);
         }
-        ProjectRecords projectRecords = dao.getRuralProjectRecords(projectReportData.getProject().getId());
+        ProjectRecords projectRecords = ruralProjectMessageDao.getRuralProjectRecords(projectReportData.getProject().getId());
         Office recordsOffice =officeService.get(projectRecords.getOffice());
         String title = "项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
         String str =  "项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
@@ -1057,7 +1056,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
             e.printStackTrace();
             logger.error("Exception e:"+e);
         }
-        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProject().getId());
+        Projectcontentinfo projectcontentinfo1 = ruralProjectMessageDao.getByProjectId(projectcontentinfo.getProject().getId());
         String dictType = projectcontentinfo.getDictType();
         RuralProjectRecords records = ruralProjectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
         info.setProject(records);
@@ -1143,7 +1142,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
 
     public ProjectReportData getProjectReportDateByProjectId(String projectId){
         if (StringUtils.isNotBlank(projectId)) {
-            ProjectReportData projectReportData = dao.getProjectReportDateByProjectId(projectId);
+            ProjectReportData projectReportData = ruralProjectMessageDao.getProjectReportDateByProjectId(projectId);
             return projectReportData;
         }
         return null;
@@ -1957,7 +1956,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
 
     @Transactional(propagation = Propagation.REQUIRED, readOnly = false)
     public void updateSelectiveById(RuralProjectReportData projectRecords) {
-        dao.updateRuralProjectReportDataById(projectRecords);
+        ruralProjectMessageDao.updateRuralProjectReportDataById(projectRecords);
     }
 
 
@@ -2026,11 +2025,11 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
     @Transactional(readOnly = false)
     public void update(ProjectReportData projectReportData) {
         projectReportData.preUpdate();
-        dao.updateRuralProjectReportData(projectReportData);
+        ruralProjectMessageDao.updateRuralProjectReportData(projectReportData);
         if (com.jeeplus.common.utils.StringUtils.isBlank(projectReportData.getFileStatus())) {
             projectReportData.setFileStatus("1");
         }
-        dao.updateFileStatus(projectReportData);
+        ruralProjectMessageDao.updateFileStatus(projectReportData);
     }
 
 
@@ -2091,11 +2090,11 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
 
     @Transactional(readOnly = false)
     public void insert(ProjectReportRecord projectReportRecord) {
-        dao.insertProjectReportRecord(projectReportRecord);
+        ruralProjectMessageDao.insertProjectReportRecord(projectReportRecord);
     }
     @Transactional(readOnly = false)
     public void insertProjectMaterialDefectRecord(ProjectMaterialDefectRecord materialDefectRecord) {
-        dao.insertProjectMaterialDefectRecord(materialDefectRecord);
+        ruralProjectMessageDao.insertProjectMaterialDefectRecord(materialDefectRecord);
     }
 
     @Transactional(readOnly = false)
@@ -2107,11 +2106,11 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         if (projectReportRecord.getIsNewRecord()){
             projectReportRecord.preInsert();
             projectReportRecord.setCreateDate(new Date());
-            dao.insertProjectReportRecord(projectReportRecord);
+            ruralProjectMessageDao.insertProjectReportRecord(projectReportRecord);
         }else{
             projectReportRecord.preUpdate();
             //修改归档信息
-            dao.updateProjectReportRecord(projectReportRecord);
+            ruralProjectMessageDao.updateProjectReportRecord(projectReportRecord);
         }
         saveWorkattachments(projectReportRecord);
     }
@@ -2124,11 +2123,11 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         if (materialDefectRecord.getIsNewRecord()){
             materialDefectRecord.preInsert();
             materialDefectRecord.setCreateDate(new Date());
-            dao.insertProjectMaterialDefectRecord(materialDefectRecord);
+            ruralProjectMessageDao.insertProjectMaterialDefectRecord(materialDefectRecord);
         }else{
             materialDefectRecord.preUpdate();
             //修改归档信息
-            dao.updateProjectMaterialDefectRecord(materialDefectRecord);
+            ruralProjectMessageDao.updateProjectMaterialDefectRecord(materialDefectRecord);
         }
         saveDefectRecordWorkattachments(materialDefectRecord);
     }
@@ -2192,7 +2191,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
     }
 
     public ProjectRecords getMasters(String id) {
-        ProjectRecords projectRecords = dao.getRuralProjectRecords(id);
+        ProjectRecords projectRecords = ruralProjectMessageDao.getRuralProjectRecords(id);
         List<User> users = workProjectUserDao.queryProjectUsers(projectRecords.getId(), "1");
         projectRecords.setProjectLeaders(users);
         return projectRecords;
@@ -2216,7 +2215,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         if(com.jeeplus.common.utils.StringUtils.isNotBlank(num)){
             projectReportNumService.updateNum(num);
         }
-        ProjectRecords projectRecords = dao.getRuralProjectRecords(projectReportData.getProject().getId());
+        ProjectRecords projectRecords = ruralProjectMessageDao.getRuralProjectRecords(projectReportData.getProject().getId());
         Office recordsOffice =officeService.get(projectRecords.getOffice());
         ProjectReportData projectReportDataInfo = projectReportDataService.get(projectReportData.getId());
         String title = "项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
@@ -2370,7 +2369,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         if(com.jeeplus.common.utils.StringUtils.isNotBlank(num)){
             projectReportNumService.updateNum(num);
         }
-        ProjectRecords projectRecords = dao.getRuralProjectRecords(projectReportData.getProject().getId());
+        ProjectRecords projectRecords = ruralProjectMessageDao.getRuralProjectRecords(projectReportData.getProject().getId());
         Office recordsOffice =officeService.get(projectRecords.getOffice());
         String title = "项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
         String str =  "项目【"+projectRecords.getProjectName()+"】报告质量复核待审批";
@@ -2507,7 +2506,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         return "true";
     }
     public ProjectReportRecord getProjectReportRecord(String reportId){
-        ProjectReportRecord projectReportRecord = dao.getProjectReportRecord(reportId);
+        ProjectReportRecord projectReportRecord = ruralProjectMessageDao.getProjectReportRecord(reportId);
         if(projectReportRecord != null){
             if (com.jeeplus.common.utils.StringUtils.isNotBlank(projectReportRecord.getId())){
                 Workattachment workattachment = new Workattachment();
@@ -2615,7 +2614,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
      */
     @Transactional(readOnly = false)
     public void updateProjectcontentinfo(Projectcontentinfo projectcontentinfo){
-        dao.updateProjectcontentinfo(projectcontentinfo);
+        ruralProjectMessageDao.updateProjectcontentinfo(projectcontentinfo);
     }
 
     /**
@@ -2624,7 +2623,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
      */
     @Transactional(readOnly = false)
     public void deleteReport(ProjectReportData projectReportData, List<ProjectTemplateInfo> attachmentList){
-        dao.deleteReport(projectReportData);
+        ruralProjectMessageDao.deleteReport(projectReportData);
         //删除流程表信息
         workProjectNotifyService.deleteActivityProcess(projectReportData.getProcessInstanceId());
         //删除流程人员表信息
@@ -2648,13 +2647,13 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
      */
     @Transactional(readOnly = false)
     public Integer updateReported(RuralProjectRecords projectRecords){
-        RuralProjectRecords records = dao.getRecordsInfo(projectRecords);
+        RuralProjectRecords records = ruralProjectMessageDao.getRecordsInfo(projectRecords);
         if(records.getReportedType().equals("1") && records.getReportedState().equals("5") && null != records.getAuditPassDate()){
             projectRecords.setReportedState("7");
         }else{
             projectRecords.setReportedState("5");
         }
-        return dao.updateReported(projectRecords);
+        return ruralProjectMessageDao.updateReported(projectRecords);
     }
 
     /**
@@ -2854,7 +2853,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
     public List<RuralReportConsultant> disposeConsultant(List<RuralReportConsultant> consultants,RuralProjectRecords projectRecords){
         List<RuralReportConsultant> consultantInfoList = Lists.newArrayList();
         //查询报告信息
-        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectRecords.getId());
+        Projectcontentinfo projectcontentinfo1 = ruralProjectMessageDao.getByProjectId(projectRecords.getId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         //创建负责人信息
         RuralReportConsultant master = new RuralReportConsultant();
@@ -3160,7 +3159,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         projectReportDataService.updateFileStatus(projectReportData);
         // 修改更新流程实例ID
         projectReportRecord.setProcessInstanceId(processInstance.getId());
-        dao.updateProcessInstanceId(projectReportRecord);
+        ruralProjectMessageDao.updateProcessInstanceId(projectReportRecord);
         //通知添加流程实例ID
         workProjectNotify.setProcessInstanceId(processInstance.getId());
         workProjectNotifyService.save(workProjectNotify);
@@ -3351,7 +3350,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         projectReportDataService.updateFileStatus(projectReportData);
         // 修改更新流程实例ID
         materialDefectRecord.setProcessInstanceId(processInstance.getId());
-        dao.updateDefectRecordProcessInstanceId(materialDefectRecord);
+        ruralProjectMessageDao.updateDefectRecordProcessInstanceId(materialDefectRecord);
         //通知添加流程实例ID
         workProjectNotify.setProcessInstanceId(processInstance.getId());
         workProjectNotify.setWapBeginDate(new Date());
@@ -3465,7 +3464,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         RuralProjectRecords records = new RuralProjectRecords();
         records.setId(reported.getId());
         records.setReportedState(String.valueOf(projectStatus.getValue()));
-        dao.updateReported(records);
+        ruralProjectMessageDao.updateReported(records);
 
         return null;
     }
@@ -4050,7 +4049,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
             }
             ruralProjectRecordsReportedDao.update(reported);
             //修改项目表中字段信息
-            dao.updateReported(records);
+            ruralProjectMessageDao.updateReported(records);
 
             return "保存审核意见成功！";
         }catch (ActivitiObjectNotFoundException e){
@@ -4368,7 +4367,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         RuralProjectRecords records = new RuralProjectRecords();
         records.setId(reported.getId());
         records.setReportedState(String.valueOf(projectStatus.getValue()));
-        dao.updateReported(records);
+        ruralProjectMessageDao.updateReported(records);
 
         return null;
     }
@@ -4901,7 +4900,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
             }
             ruralProjectRecordsReportedDao.update(reported);
             //修改项目表中字段信息
-            dao.updateReported(records);
+            ruralProjectMessageDao.updateReported(records);
 
             return "保存审核意见成功！";
         }catch (ActivitiObjectNotFoundException e){
@@ -4969,7 +4968,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
             RuralProjectRecords records = new RuralProjectRecords();
             records.setId(reported.getId());
             records.setReportedState(String.valueOf(ProjectStatusEnum.RECALL.getValue()));
-            dao.updateReported(records);
+            ruralProjectMessageDao.updateReported(records);
 
         }catch (ActivitiObjectNotFoundException e){
             System.err.println("上报撤销异常，因为这个流程已不存在!");
@@ -5001,7 +5000,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
      * @return
      */
     public List<Area> getProjectReportedAreaByParentId(String parentId){
-        return dao.getProjectReportedAreaByParentId(parentId);
+        return ruralProjectMessageDao.getProjectReportedAreaByParentId(parentId);
     }
 
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -30,7 +30,6 @@ import com.jeeplus.modules.projectcontentinfo.dao.ProjectReportDataDao;
 import com.jeeplus.modules.projectcontentinfo.dao.ProjectcontentinfoDao;
 import com.jeeplus.modules.projectcontentinfo.entity.*;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
-import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
@@ -88,6 +87,7 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -103,6 +103,7 @@ import java.util.*;
  * @version 2020-04-15
  */
 @Service
+@Lazy
 @Transactional(readOnly = true)
 public class RuralProjectMessageService extends CrudService<RuralProjectMessageDao, RuralProjectRecords> {
     private static final String HTTPTOP = Global.getConfig("signature_http_top");
@@ -175,8 +176,6 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
     @Autowired
     private HistoricalService historicalService;
     @Autowired
-    private ProjectcontentinfoService projectcontentinfoService;
-    @Autowired
     private ProjectTemplateService projectTemplateService;
     @Autowired
     private SubProjectInfoService subProjectInfoService;
@@ -987,7 +986,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             e.printStackTrace();
             logger.error("Exception e:"+e);
         }
-        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectOnRural().getId());
+        Projectcontentinfo projectcontentinfo1 = dao.getByProjectId(projectcontentinfo.getProjectOnRural().getId());
         String dictType = projectcontentinfo.getDictType();
         RuralProjectRecords records = ruralProjectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
         info.setProject(records);
@@ -3480,7 +3479,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
     public List<RuralReportConsultant> disposeConsultant(List<RuralReportConsultant> consultants,RuralProjectRecords projectRecords){
         List<RuralReportConsultant> consultantInfoList = Lists.newArrayList();
         //查询报告信息
-        Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectRecords.getId());
+        Projectcontentinfo projectcontentinfo1 = dao.getByProjectId(projectRecords.getId());
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
         //创建负责人信息
         RuralReportConsultant master = new RuralReportConsultant();

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/SubProjectInfoService.java

@@ -12,12 +12,10 @@ import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.MenuStatusEnum;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
 import com.jeeplus.modules.ruralprojectrecords.dao.SubProjectInfoDao;
 import com.jeeplus.modules.ruralprojectrecords.entity.ProjectReportRecordTree;
 import com.jeeplus.modules.ruralprojectrecords.entity.SubProjectInfo;
 import com.jeeplus.modules.ruralprojectrecords.utils.ImportExcelUtil;
-import com.jeeplus.modules.ruralprojectrecords.web.RuralCostProjectMessageController;
 import com.jeeplus.modules.sys.dao.WorkattachmentDao;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Workattachment;
@@ -25,6 +23,7 @@ import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import org.apache.commons.compress.archivers.sevenz.SevenZArchiveEntry;
+import org.apache.commons.compress.archivers.sevenz.SevenZFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,13 +38,6 @@ import java.nio.charset.Charset;
 import java.util.*;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import org.apache.commons.compress.archivers.sevenz.SevenZFile;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Enumeration;
 
 /**
  * 子项目service
@@ -63,10 +55,6 @@ public class SubProjectInfoService extends CrudService<SubProjectInfoDao, SubPro
     private WorkattachmentDao workattachmentDao;
     @Autowired
     private WorkattachmentService workattachmentService;
-    @Autowired
-    private ProjectTemplateService projectTemplateService;
-    @Autowired
-    private RuralProjectMessageService ruralProjectMessageService;
 
     /**
      * 获取项目附件模板类型

src/main/java/com/jeeplus/modules/statement/controller/StatementCompanyComprehensiveController.java

@@ -7,7 +7,6 @@ import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
 import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
-import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.statement.entity.StatementCompanyComprehensiveInfo;
 import com.jeeplus.modules.statement.service.StatementCompanyComprehensiveService;
@@ -46,8 +45,6 @@ public class StatementCompanyComprehensiveController extends BaseController {
     private WorkProjectNotifyService workProjectNotifyService;
     @Autowired
     private ProjectEngineeringService engineeringService;
-    @Autowired
-    private RuralProjectMessageService ruralProjectMessageService;
 
     @Autowired
     private WorkReimbursementService workReimbursementService;

src/main/java/com/jeeplus/modules/workbidingevaluation/service/WorkBidingEvaluationService.java

@@ -3,36 +3,21 @@
  */
 package com.jeeplus.modules.workbidingevaluation.service;
 
-import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
-import com.jeeplus.common.utils.MenuStatusEnum;
-import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.modules.sys.dao.JudgeDao;
-import com.jeeplus.modules.sys.entity.Judge;
-import com.jeeplus.modules.sys.service.JudgeService;
 import com.jeeplus.modules.workbidingevaluation.dao.WorkBidingEvaluationDao;
 import com.jeeplus.modules.workbidingevaluation.entity.WorkBidingEvaluation;
-import com.jeeplus.modules.workbidingproject.entity.WorkBidingProject;
-import com.jeeplus.modules.workbidingproject.service.WorkBidingProjectService;
-import com.jeeplus.modules.workprojectdeposit.entity.WorkProjectDeposit;
-import com.jeeplus.modules.workprojectdeposit.service.WorkProjectDepositService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
 
 /**
  * 评标管理Service
  * @author fgy
  * @version 2017-12-28
  */
-@SuppressWarnings("all")
-@Service
-@Transactional(readOnly = true)
+//@SuppressWarnings("all")
+//@Service
+//@Transactional(readOnly = true)
 public class WorkBidingEvaluationService extends CrudService<WorkBidingEvaluationDao, WorkBidingEvaluation> {
 
-	@Autowired
+	/*@Autowired
 	private JudgeService judgeService;
 	@Autowired
 	private JudgeDao judgeDao;
@@ -324,5 +309,5 @@ public class WorkBidingEvaluationService extends CrudService<WorkBidingEvaluatio
 			e.printStackTrace();
 		}
 		return get(workBidingEvaluationId);
-	}
+	}*/
 }

src/main/java/com/jeeplus/modules/workbidingevaluation/web/WorkBidingEvaluationController.java

@@ -3,44 +3,7 @@
  */
 package com.jeeplus.modules.workbidingevaluation.web;
 
-import com.google.common.collect.Lists;
-import com.jeeplus.common.config.Global;
-import com.jeeplus.common.json.AjaxJson;
-import com.jeeplus.common.persistence.Page;
-import com.jeeplus.common.utils.DateUtils;
-import com.jeeplus.common.utils.MyBeanUtils;
-import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.utils.excel.ExportExcel;
-import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
-import com.jeeplus.modules.sys.entity.Judge;
-import com.jeeplus.modules.sys.entity.Office;
-import com.jeeplus.modules.sys.entity.Role;
-import com.jeeplus.modules.sys.service.JudgeService;
-import com.jeeplus.modules.sys.utils.UserUtils;
-import com.jeeplus.modules.workbidingevaluation.entity.WorkBidingEvaluation;
-import com.jeeplus.modules.workbidingevaluation.service.WorkBidingEvaluationService;
-import com.jeeplus.modules.workbidingproject.entity.WorkBidingProject;
-import com.jeeplus.modules.workevaluationroom.entity.WorkEvaluationRoom;
-import com.jeeplus.modules.workevaluationroom.service.WorkEvaluationRoomService;
-import com.jeeplus.modules.workprojectdeposit.entity.WorkProjectDeposit;
-import com.jeeplus.modules.workprojectdeposit.service.WorkProjectDepositService;
-import org.apache.shiro.authz.annotation.Logical;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolationException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 评标管理Controller
@@ -48,11 +11,11 @@ import java.util.List;
  * @version 2017-12-28
  */
 @SuppressWarnings("all")
-@Controller
-@RequestMapping(value = "${adminPath}/workbidingevaluation/workBidingEvaluation")
+//@Controller
+//@RequestMapping(value = "${adminPath}/workbidingevaluation/workBidingEvaluation")
 public class WorkBidingEvaluationController extends BaseController {
 
-	@Autowired
+	/*@Autowired
 	private WorkBidingEvaluationService workBidingEvaluationService;
 	@Autowired
 	private WorkProjectDepositService workProjectDepositService;
@@ -73,9 +36,9 @@ public class WorkBidingEvaluationController extends BaseController {
 		return entity;
 	}
 	
-	/**
+	*//**
 	 * 评标管理列表页面
-	 */
+	 *//*
 	@RequiresPermissions("workbidingevaluation:workBidingEvaluation:list")
 	@RequestMapping(value = {"list", ""})
 	public String list(WorkBidingEvaluation workBidingEvaluation, HttpServletRequest request, HttpServletResponse response, Model model) {
@@ -98,9 +61,9 @@ public class WorkBidingEvaluationController extends BaseController {
 		return "modules/workbidingevaluation/workBidingEvaluationList";
 	}
 
-	/**
+	*//**
 	 * 查看，增加，编辑评标管理表单页面
-	 */
+	 *//*
 	@RequiresPermissions(value={"workbidingevaluation:workBidingEvaluation:view","workbidingevaluation:workBidingEvaluation:add","workbidingevaluation:workBidingEvaluation:edit"},logical=Logical.OR)
 	@RequestMapping(value = "form")
 	public String form(WorkBidingEvaluation workBidingEvaluation, Model model ,HttpServletRequest request) {
@@ -125,9 +88,9 @@ public class WorkBidingEvaluationController extends BaseController {
 		return "modules/workbidingevaluation/workBidingEvaluationForm";
 	}
 
-	/**
+	*//**
 	 * 保存评标管理
-	 */
+	 *//*
 	@RequiresPermissions(value={"workbidingevaluation:workBidingEvaluation:add","workbidingevaluation:workBidingEvaluation:edit"},logical=Logical.OR)
 	@RequestMapping(value = "save")
 	public String save(WorkBidingEvaluation workBidingEvaluation, Model model,HttpServletRequest request, RedirectAttributes redirectAttributes) throws Exception{
@@ -157,9 +120,9 @@ public class WorkBidingEvaluationController extends BaseController {
 		return "redirect:"+Global.getAdminPath()+"/workbidingevaluation/workBidingEvaluation/?repage";
 	}
 	
-	/**
+	*//**
 	 * 删除评标管理
-	 */
+	 *//*
 	@RequiresPermissions("workbidingevaluation:workBidingEvaluation:del")
 	@RequestMapping(value = "delete")
 	public String delete(WorkBidingEvaluation workBidingEvaluation, RedirectAttributes redirectAttributes) {
@@ -269,9 +232,9 @@ public class WorkBidingEvaluationController extends BaseController {
 		return ajaxJson;
 	}
 
-	/**
+	*//**
 	 * 批量删除评标管理
-	 */
+	 *//*
 	@RequiresPermissions("workbidingevaluation:workBidingEvaluation:del")
 	@RequestMapping(value = "deleteAll")
 	public String deleteAll(String ids, RedirectAttributes redirectAttributes) {
@@ -332,9 +295,9 @@ public class WorkBidingEvaluationController extends BaseController {
         return ajaxJson;
 	}
 
-	/**
+	*//**
 	 * 选择评标室
-	 */
+	 *//*
 	@RequestMapping(value = "selectRoom")
 	public String selectRoom(WorkEvaluationRoom room, String url, String fieldLabels, String fieldKeys, String searchLabel, String searchKey,String floorLabel,String floorKey,String housenumberLabel,String housenumberKey, HttpServletRequest request, HttpServletResponse response, Model model) {
 		room.setCompanyId(UserUtils.getSelectCompany().getId());
@@ -363,9 +326,9 @@ public class WorkBidingEvaluationController extends BaseController {
 		return "modules/sys/selectWorkEvaluationRoom";
 	}
 
-	/**
+	*//**
 	 * 导出excel文件
-	 */
+	 *//*
 	@RequiresPermissions("workbidingevaluation:workBidingEvaluation:export")
     @RequestMapping(value = "export", method=RequestMethod.POST)
     public String exportFile(WorkBidingEvaluation workBidingEvaluation, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
@@ -380,10 +343,10 @@ public class WorkBidingEvaluationController extends BaseController {
 		return "redirect:"+Global.getAdminPath()+"/workbidingevaluation/workBidingEvaluation/?repage";
     }
 
-	/**
+	*//**
 	 * 导入Excel数据
 
-	 */
+	 *//*
 	@RequiresPermissions("workbidingevaluation:workBidingEvaluation:import")
     @RequestMapping(value = "import", method=RequestMethod.POST)
     public String importFile(MultipartFile file, RedirectAttributes redirectAttributes) {
@@ -413,9 +376,9 @@ public class WorkBidingEvaluationController extends BaseController {
 		return "redirect:"+Global.getAdminPath()+"/workbidingevaluation/workBidingEvaluation/?repage";
     }
 	
-	/**
+	*//**
 	 * 下载导入评标管理数据模板
-	 */
+	 *//*
 	@RequiresPermissions("workbidingevaluation:workBidingEvaluation:import")
     @RequestMapping(value = "import/template")
     public String importFileTemplate(HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes) {
@@ -428,7 +391,7 @@ public class WorkBidingEvaluationController extends BaseController {
 			addMessage(redirectAttributes, "导入模板下载失败！失败信息："+e.getMessage());
 		}
 		return "redirect:"+Global.getAdminPath()+"/workbidingevaluation/workBidingEvaluation/?repage";
-    }
+    }*/
 	
 	
 	

src/main/java/com/jeeplus/modules/workfullmanage/service/WorkFullManageService.java

@@ -38,7 +38,6 @@ 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.workclientinfo.service.WorkClientInfoService;
-import com.jeeplus.modules.workcontractinfo.dao.WorkContractAnnexDao;
 import com.jeeplus.modules.workcontractinfo.dao.WorkContractInfoDao;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
@@ -109,8 +108,6 @@ public class WorkFullManageService extends CrudService<WorkFullManageDao, WorkFu
 	@Autowired
 	private WorkFullExecuteDao workFullExecuteDao;
 	@Autowired
-	private WorkContractAnnexDao workContractAnnexDao;
-	@Autowired
 	private RoleDao roleDao;
 	@Autowired
 	private WorkClientLinkmanDao workClientLinkmanDao;

src/main/java/com/jeeplus/modules/workloan/web/WorkLoanController.java

@@ -3,44 +3,34 @@
  */
 package com.jeeplus.modules.workloan.web;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolationException;
-
 import com.google.common.base.Strings;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.jeeplus.common.config.Global;
 import com.jeeplus.common.mapper.JsonMapper;
+import com.jeeplus.common.persistence.Page;
+import com.jeeplus.common.utils.DateUtils;
+import com.jeeplus.common.utils.MyBeanUtils;
+import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.excel.ExportExcel;
+import com.jeeplus.common.utils.excel.ImportExcel;
+import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
-import com.jeeplus.modules.projectrecord.dao.WorkProjectUserDao;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
-import com.jeeplus.modules.sys.service.OfficeService;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import com.jeeplus.modules.sysmtree.service.SysMtreeService;
-import com.jeeplus.modules.workactivity.service.ActivityService;
-import com.jeeplus.modules.workbidproject.service.WorkBidProjectService;
-import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
-import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
-import com.jeeplus.modules.workfullmanage.service.WorkFullManageService;
+import com.jeeplus.modules.workloan.entity.WorkLoan;
+import com.jeeplus.modules.workloan.service.WorkLoanService;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
-import com.jeeplus.modules.worksupplier.service.WorkSupplierService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
-import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -49,17 +39,15 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import com.google.common.collect.Lists;
-import com.jeeplus.common.utils.DateUtils;
-import com.jeeplus.common.utils.MyBeanUtils;
-import com.jeeplus.common.config.Global;
-import com.jeeplus.common.persistence.Page;
-import com.jeeplus.common.web.BaseController;
-import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.utils.excel.ExportExcel;
-import com.jeeplus.common.utils.excel.ImportExcel;
-import com.jeeplus.modules.workloan.entity.WorkLoan;
-import com.jeeplus.modules.workloan.service.WorkLoanService;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.ConstraintViolationException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 借款Controller
@@ -84,24 +72,9 @@ public class WorkLoanController extends BaseController {
 
 	@Autowired
 	private HttpServletRequest request;
-
-	@Autowired
-	private WorkClientInfoService workClientInfoService;
-	@Autowired
-	private WorkFullManageService workFullManageService;
-
-	@Autowired
-	private WorkBidProjectService workBidProjectService;
-
-	@Autowired
-	private SysMtreeService sysMtreeService;
-	@Autowired
-	private ActivityService activityService;
 	@Autowired
 	private ProjectRecordsService projectRecordsService;
 	@Autowired
-	private OfficeService officeService;
-	@Autowired
 	private WorkStaffBasicInfoService workStaffBasicInfoService;
 
 	@ModelAttribute

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

@@ -250,8 +250,6 @@ public class WorkProjectNotifyController extends BaseController {
 	 */
 	private final static String aliyunUrl = Global.getConfig("aliyunUrl");
 	@Autowired
-	private WorkFullManageService workFullManageService;
-	@Autowired
 	private WorkExampleService workExampleService;
 	@Autowired
 	private WorkLoanService workLoanService;

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

@@ -30,7 +30,7 @@
 	</delete>
 
 
-    <select id="get" resultType="Projectcontentinfo" >
+    <select id="get" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" >
 		SELECT
 			<include refid="projectcontentinfoColumns"/>
 		FROM project_content_info a
@@ -38,7 +38,7 @@
 		WHERE a.id = #{id}
 	</select>
 
-	<select id="getByProjectId" resultType="Projectcontentinfo" >
+	<select id="getByProjectId" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" >
 		SELECT
 			<include refid="projectcontentinfoColumns"/>
 		FROM project_content_info a
@@ -49,7 +49,7 @@
 	</select>
 
 
-	<select id="getByInfoId" resultType="Projectcontentinfo" >
+	<select id="getByInfoId" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" >
 		SELECT
 			<include refid="projectcontentinfoColumns"/>
 		FROM project_content_info a
@@ -57,7 +57,7 @@
 		WHERE a.info_id = #{infoId} AND (a.link_id is null or a.link_id='')
 	</select>
 
-	<select id="findList" resultType="Projectcontentinfo" >
+	<select id="findList" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" >
 		SELECT
 			<include refid="projectcontentinfoColumns"/>
 		FROM project_content_info a
@@ -87,7 +87,7 @@
 		</choose>
 	</select>
 
-	<select id="findByParentIds" resultType="Projectcontentinfo" >
+	<select id="findByParentIds" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" >
 		SELECT
 			<include refid="projectcontentinfoColumns"/>
 		FROM project_content_info a
@@ -100,7 +100,7 @@
 		ORDER BY a.sort ASC
 	</select>
 
-	<select id="findListByProject" resultType="Projectcontentinfo" >
+	<select id="findListByProject" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" >
 		SELECT
 		<include refid="projectcontentinfoColumns"/>
 		FROM project_content_info a
@@ -178,7 +178,7 @@
 	</select>
 
 
-	<select id="findByType" resultType="Projectcontentinfo" >
+	<select id="findByType" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" >
 		SELECT
 		<include refid="projectcontentinfoColumns"/>
 		FROM project_content_info a
@@ -192,7 +192,7 @@
 		ORDER BY a.create_date DESC
 		limit 1
 	</select>
-	<select id="findByInfoId" resultType="Projectcontentinfo" >
+	<select id="findByInfoId" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" >
 		SELECT
 		<include refid="projectcontentinfoColumns"/>
 		FROM project_content_info a
@@ -205,7 +205,7 @@
 		ORDER BY a.create_date DESC
 	</select>
 
-	<select id="findListByProjectAndType" resultType="Projectcontentinfo" >
+	<select id="findListByProjectAndType" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" >
 		SELECT
 		<include refid="projectcontentinfoColumns"/>
 		FROM project_content_info a
@@ -226,7 +226,7 @@
 			</otherwise>
 		</choose>
 	</select>
-	<select id="findListByProjectAndTypes" resultType="Projectcontentinfo" >
+	<select id="findListByProjectAndTypes" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" >
 		SELECT
 		<include refid="projectcontentinfoColumns"/>
 		FROM project_content_info a
@@ -248,7 +248,7 @@
 		</choose>
 	</select>
 
-	<select id="findListByProjectAndDictType" resultType="Projectcontentinfo" >
+	<select id="findListByProjectAndDictType" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" >
 		SELECT
 		<include refid="projectcontentinfoColumns"/>
 		FROM project_content_info a
@@ -270,7 +270,7 @@
 		</choose>
 	</select>
 
-	<select id="findListByProjectType" resultType="Projectcontentinfo" >
+	<select id="findListByProjectType" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" >
 		SELECT
 		<include refid="projectcontentinfoColumns"/>
 		FROM project_content_info a
@@ -291,7 +291,7 @@
 		</choose>
 	</select>
 
-	<select id="findAllList" resultType="Projectcontentinfo" >
+	<select id="findAllList" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" >
 		SELECT
 			<include refid="projectcontentinfoColumns"/>
 		FROM project_content_info a
@@ -446,7 +446,7 @@
 
 
 	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
-	<select id="findUniqueByProperty" resultType="Projectcontentinfo" statementType="STATEMENT">
+	<select id="findUniqueByProperty" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" statementType="STATEMENT">
 		select * FROM project_content_info  where ${propertyName} = '${value}'
 	</select>
 
@@ -460,7 +460,7 @@
         </where>
     </select>
 
-    <select id="findListByParentSelective" resultType="Projectcontentinfo" >
+    <select id="findListByParentSelective" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" >
         SELECT
         <include refid="projectcontentinfoColumns"/>
         FROM project_content_info a
@@ -510,7 +510,7 @@
         DELETE FROM project_content_info WHERE parent_ids LIKE concat(#{parentIds},'%');
     </update>
 
-	<select id="findType" resultType="Projectcontentinfo">
+	<select id="findType" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo">
 		SELECT id from project_content_info
 		<where>
 			project_id = #{projectId}
@@ -571,7 +571,7 @@
 	</select>
 
 
-	<select id="getTypeByProjectIdAndContentId" resultType="WorkContentClaim">
+	<select id="getTypeByProjectIdAndContentId" resultType="com.jeeplus.modules.workcontent.entity.WorkContentClaim">
 		select wcc.project_id as projectId, wcc.review_amt  as 'reviewAmt',wcc.set_amt as 'setAmt',wcc.content_id as 'contentId',pcd2.name as 'proConTentName',
 		wcc.cont_id as 'contract.id',
 		wct.type_name as 'typeName',wcc.create_date as 'createDate',wcc.update_date as 'updateDate', pcd.name as 'name',

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

@@ -1536,4 +1536,30 @@
 		order by update_date desc
 		limit 1
 	</select>
+
+	<select id="getByProjectId" resultType="com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo" >
+		SELECT
+		a.id AS "id",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag",
+		a.parent_id AS "parent.id",
+		a.parent_ids AS "parentIds",
+		a.sort AS "sort",
+		a.project_id AS "project.id",
+		a.company_id AS "companyId",
+		a.office_id AS "officeId",
+		a.type AS "type",
+		a.info_id AS "infoId",
+		a.dict_type AS "dictType",
+		a.name AS "name",
+		a.link_id AS "linkId"
+		FROM project_content_info a
+		WHERE a.project_id = #{projectId}
+		order by update_date desc
+		limit 1
+	</select>
 </mapper>