界面展示修改和获取数据修改

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

@@ -1562,7 +1562,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 		//序号
 		int count=1;
 		//成果文件
-		if (ruralProjectcontentinfo.getFileAttachmentList().size()>0){
+		if (null != ruralProjectcontentinfo.getFileAttachmentList() && ruralProjectcontentinfo.getFileAttachmentList().size()>0){
 			List<ProjectTemplateInfo> infos=ruralProjectcontentinfo.getFileAttachmentList();
 			for (int i=0;i<infos.size();i++){
 				if (null != infos.get(i).getWorkAttachments() &&infos.get(i).getWorkAttachments().size()>0){
@@ -1580,7 +1580,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 			}
 		}
 		//依据性文件
-		if (ruralProjectcontentinfo.getFileGistdataList().size()>0){
+		if (null != ruralProjectcontentinfo.getFileGistdataList() && ruralProjectcontentinfo.getFileGistdataList().size()>0){
 			List<ProjectTemplateInfo> infos=ruralProjectcontentinfo.getFileGistdataList();
 			for (int i=0;i<infos.size();i++){
 				if (null != infos.get(i).getWorkAttachments() && infos.get(i).getWorkAttachments().size()>0){
@@ -1598,7 +1598,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 			}
 		}
 		//其它文件
-		if (ruralProjectcontentinfo.getFileGistdataList().size()>0){
+		if (null != ruralProjectcontentinfo.getFileOtherList() && ruralProjectcontentinfo.getFileOtherList().size()>0){
 			List<ProjectTemplateInfo> infos=ruralProjectcontentinfo.getFileOtherList();
 			for (int i=0;i<infos.size();i++){
 				if (null != infos.get(i).getWorkAttachments() && infos.get(i).getWorkAttachments().size()>0){

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

@@ -4176,7 +4176,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         //序号
         int count=1;
         //成果文件
-        if (ruralProjectcontentinfo.getFileAttachmentList().size()>0){
+        if (null != ruralProjectcontentinfo.getFileAttachmentList() && ruralProjectcontentinfo.getFileAttachmentList().size()>0){
             List<ProjectTemplateInfo> infos=ruralProjectcontentinfo.getFileAttachmentList();
             for (int i=0;i<infos.size();i++){
                 if (infos.get(i).getWorkAttachments().size()>0){
@@ -4194,7 +4194,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
             }
         }
         //依据性文件
-        if (ruralProjectcontentinfo.getFileGistdataList().size()>0){
+        if (null != ruralProjectcontentinfo.getFileGistdataList() && ruralProjectcontentinfo.getFileGistdataList().size()>0){
             List<ProjectTemplateInfo> infos=ruralProjectcontentinfo.getFileGistdataList();
             for (int i=0;i<infos.size();i++){
                 if (infos.get(i).getWorkAttachments().size()>0){
@@ -4212,7 +4212,7 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
             }
         }
         //其它文件
-        if (ruralProjectcontentinfo.getFileGistdataList().size()>0){
+        if (null != ruralProjectcontentinfo.getFileOtherList() && ruralProjectcontentinfo.getFileOtherList().size()>0){
             List<ProjectTemplateInfo> infos=ruralProjectcontentinfo.getFileOtherList();
             for (int i=0;i<infos.size();i++){
                 if (infos.get(i).getWorkAttachments().size()>0){

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

@@ -4028,7 +4028,13 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             User user = UserUtils.get(principalUserId);
             if(null != user){
                 //获取成员印章id信息
+                long s1=System.currentTimeMillis();
                 String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"",user.getName() + "一级注册造价工程师章-竖");
+                long s2=System.currentTimeMillis();
+                System.out.println("第一个人员印章获取时间：" + (s2 - s1));
+
+
+
                 if(StringUtils.isNotBlank(userSealId)){
                     for (String documentId: documentList) {
                         //添加盖章位置
@@ -4058,7 +4064,11 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         User technologyPrincipalUser = UserUtils.getByLoginName("陈红星");
         if(null != technologyPrincipalUser){
             //获取成员印章id信息
+            long s1=System.currentTimeMillis();
             String userSealId = SignaturePostUtil.getUserSealByMobile(technologyPrincipalUser.getMobile(),"","陈红星个人签名章-竖");
+            long s2=System.currentTimeMillis();
+            System.out.println("第二个人员印章获取时间：" + (s2 - s1));
+
             if(StringUtils.isNotBlank(userSealId)){
                 for (String documentId: documentList) {
                     //添加盖章位置
@@ -4086,14 +4096,14 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         }
         List<String> serialIdList = new ArrayList<String>(serialIdSet);
         companyAction.setSealIds("[" + String.join(",", serialIdList) + "]");
-        companyAction.setAutoSign("true");
+        companyAction.setAutoSign("false");
         companyAction.setLocations(locations);
         actions.add(companyAction);
 
         //创建个人职业章参数
         Action professionalChapterAction = new Action();
         professionalChapterAction.setType("PRACTICE");
-        professionalChapterAction.setName("个人职业章");
+        professionalChapterAction.setName("杨荣华个人职业章");
         professionalChapterAction.setSerialNo("1");
 
         //添加盖章位置
@@ -4103,12 +4113,16 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
 
         //添加个人职业章人员信息
         ActionOperatorInfo actionOperatorInfo = new ActionOperatorInfo();
-        actionOperatorInfo.setOperatorContact("15240492484");
+        actionOperatorInfo.setOperatorContact("15240492484");//个人职业章盖章人的手机号
         List<ActionOperatorInfo> actionOperators = Lists.newArrayList();
+        actionOperators.add(actionOperatorInfo);
         professionalChapterAction.setActionOperators(actionOperators);
 
         //获取成员印章id信息
+        long s1=System.currentTimeMillis();
         String userSealId = SignaturePostUtil.getUserSealByMobile("15240492484","","杨荣华个人签名");
+        long s2=System.currentTimeMillis();
+        System.out.println("第三个人员印章获取时间：" + (s2 - s1));
         if(StringUtils.isNotBlank(userSealId)){
             for (String documentId: documentList) {
                 //添加盖章位置
@@ -4129,34 +4143,62 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             return hashMap;
         }
 
-        /*//获取成员印章id信息
-        String userSealId2 = SignaturePostUtil.getUserSealByMobile("18351935168","","陈红星造价工程师章");
+        List<String> serialIdsList = new ArrayList<String>(professionalChapterSerialIdSet);
+        professionalChapterAction.setSealIds("[" + String.join(",", serialIdsList) + "]");
+        professionalChapterAction.setLocations(professionalChapterLocations);
+        net.sf.json.JSONObject professionalChapterJson = net.sf.json.JSONObject.fromObject(professionalChapterAction);
+        System.out.println(professionalChapterJson.toString());
+        actions.add(professionalChapterAction);
+
+
+
+
+        //创建个人职业章参数
+        Action professionalChapterTwoAction = new Action();
+        professionalChapterTwoAction.setType("PRACTICE");
+        professionalChapterTwoAction.setName("刘建春个人职业章");
+        professionalChapterTwoAction.setSerialNo("1");
+
+        //添加盖章位置
+        List<Location> professionalChapterTwoLocations = Lists.newArrayList();
+
+        Set<String> professionalChapterTwoSerialIdSet = new HashSet<>();
+
+        //添加个人职业章人员信息
+        ActionOperatorInfo actionTwoOperatorInfo = new ActionOperatorInfo();
+        actionTwoOperatorInfo.setOperatorContact("13398782899");
+        List<ActionOperatorInfo> actionTwoOperators = Lists.newArrayList();
+        actionTwoOperators.add(actionTwoOperatorInfo);
+        professionalChapterTwoAction.setActionOperators(actionTwoOperators);
+
+        //获取成员印章id信息
+        long s3=System.currentTimeMillis();
+        String userSealId2 = SignaturePostUtil.getUserSealByMobile("13398782899","","杨荣华个人签名章");
+        long s4=System.currentTimeMillis();
+        System.out.println("第四个人员印章获取时间：" + (s4 - s3));
         if(StringUtils.isNotBlank(userSealId2)){
             for (String documentId: documentList) {
                 //添加盖章位置
                 Location principalLocation = new Location();
-                professionalChapterSerialIdSet.add(userSealId2);
+                professionalChapterTwoSerialIdSet.add(userSealId2);
                 principalLocation.setSealId(userSealId2);
                 principalLocation.setDocumentId(documentId);
                 principalLocation.setPage("0");
                 principalLocation.setRectType("SEAL_CORPORATE");
                 principalLocation.setKeywordIndex(-1);
-                principalLocation.setOffsetX("0.7758");
-                principalLocation.setOffsetY("0.7339");
-                professionalChapterLocations.add(principalLocation);
+                principalLocation.setOffsetX("0.5971");
+                principalLocation.setOffsetY("0.8176");
+                professionalChapterTwoLocations.add(principalLocation);
             }
 
-        }*/
+        }
 
-        List<String> serialIdsList = new ArrayList<String>(professionalChapterSerialIdSet);
-        professionalChapterAction.setSealIds("[" + String.join(",", serialIdsList) + "]");
-        professionalChapterAction.setLocations(locations);
-        net.sf.json.JSONObject professionalChapterJson = net.sf.json.JSONObject.fromObject(professionalChapterAction);
+        serialIdsList = new ArrayList<String>(professionalChapterTwoSerialIdSet);
+        professionalChapterTwoAction.setSealIds("[" + String.join(",", serialIdsList) + "]");
+        professionalChapterTwoAction.setLocations(professionalChapterTwoLocations);
+        professionalChapterJson = net.sf.json.JSONObject.fromObject(professionalChapterTwoAction);
         System.out.println(professionalChapterJson.toString());
-        actions.add(professionalChapterAction);
-
-
-
+        actions.add(professionalChapterTwoAction);
 
 
 
@@ -4177,9 +4219,106 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         signatureContract.setSn("");
         signatureContract.setSubject(ruralProjectRecords.getProjectName());//添加项目名称
         net.sf.json.JSONObject json = net.sf.json.JSONObject.fromObject(signatureContract);
+        System.out.println(json.toString());
+        long s5=System.currentTimeMillis();
         String contractIdMapStr = SignaturePostUtil.sendPostApplicationJson(HTTPTOP + "/contract/createbycategory", json.toString());
+        long s6=System.currentTimeMillis();
+        System.out.println("获取合同id获取时间：" + (s6 - s5));
         hashMap = JSON.parseObject(contractIdMapStr, HashMap.class);
 
+        //访问个人职业章接口信息
+        String contractIdCode = hashMap.get("code").toString();
+        String contractId = "";
+
+        //首先进行公司章的签署认证
+        if("0".equals(contractIdCode)){
+            contractId = hashMap.get("contractId").toString();
+            if(!"".equals(contractId)){
+                CommonSealSign seal = new CommonSealSign();
+                //添加刚生成的盖章合同id
+                seal.setContractId(contractId);
+                seal.setTenantName("江苏兴光项目管理有限公司");
+                net.sf.json.JSONObject sealJson = net.sf.json.JSONObject.fromObject(seal);
+                //访问个人章方法
+                long s7=System.currentTimeMillis();
+                String personalCareerSealMapStr = SignaturePostUtil.sendPostApplicationJson(HTTPTOP + "/contract/signbycompany", sealJson.toString());
+                long s8=System.currentTimeMillis();
+                System.out.println("签署公司章方法获取时间：" + (s8 - s7));
+                System.out.println(personalCareerSealMapStr);
+
+                hashMap = JSON.parseObject(personalCareerSealMapStr, HashMap.class);
+                contractIdCode = hashMap.get("code").toString();
+                if(!"0".equals(contractIdCode)){
+                    String message = hashMap.get("message").toString();
+                    message = message.replaceAll(contractId + ";","");
+                    hashMap.put("message" , message);
+                    return hashMap;
+                }
+            }
+        }
+
+        if("0".equals(contractIdCode)){
+            contractId = hashMap.get("contractId").toString();
+            if(!"".equals(contractId)){
+                //个人签字章数据处理
+
+                //将原有个人章的RectType进行变更
+                for (Location info : professionalChapterLocations) {
+                    info.setRectType("SEAL_PRACTICE");
+                }
+                PersonalSignatureSeal seal = new PersonalSignatureSeal();
+                //添加个人章手机号
+                seal.setContact(actionOperatorInfo.getOperatorContact());
+                //添加刚生成的盖章合同id
+                seal.setContractId(contractId);
+                seal.setTenantName("江苏兴光项目管理有限公司");
+                seal.setStampers(professionalChapterLocations);
+                net.sf.json.JSONObject sealJson = net.sf.json.JSONObject.fromObject(seal);
+                System.out.println(sealJson.toString());
+                //访问个人章方法
+                long s7=System.currentTimeMillis();
+                String personalCareerSealMapStr = SignaturePostUtil.sendPostApplicationJson(HTTPTOP + "/contract/signbypractice", sealJson.toString());
+                long s8=System.currentTimeMillis();
+                System.out.println("访问第一个个人签字章方法获取时间：" + (s8 - s7));
+                System.out.println(personalCareerSealMapStr);
+
+                hashMap = JSON.parseObject(personalCareerSealMapStr, HashMap.class);
+                contractIdCode = hashMap.get("code").toString();
+                if(!"0".equals(contractIdCode)){
+                    String message = hashMap.get("message").toString();
+                    message = message.replaceAll(contractId + ";","");
+                    hashMap.put("message" , message);
+                    return hashMap;
+                }
+
+
+                for (Location info : professionalChapterTwoLocations) {
+                    info.setRectType("SEAL_PRACTICE");
+                }
+                PersonalSignatureSeal sealTwo = new PersonalSignatureSeal();
+                sealTwo.setContact(actionTwoOperatorInfo.getOperatorContact());
+                sealTwo.setContractId(contractId);
+                sealTwo.setTenantName("江苏兴光项目管理有限公司");
+                sealTwo.setStampers(professionalChapterTwoLocations);
+                net.sf.json.JSONObject sealTwoJson = net.sf.json.JSONObject.fromObject(sealTwo);
+                System.out.println(sealTwoJson.toString());
+                long s9=System.currentTimeMillis();
+                String personalCareerSealTwoMapStr = SignaturePostUtil.sendPostApplicationJson(HTTPTOP + "/contract/signbypractice", sealTwoJson.toString());
+                long s10=System.currentTimeMillis();
+                System.out.println("访问第二个个人签字章方法获取时间：" + (s10 - s9));
+                System.out.println(personalCareerSealTwoMapStr);
+
+                hashMap = JSON.parseObject(personalCareerSealTwoMapStr, HashMap.class);
+                contractIdCode = hashMap.get("code").toString();
+                if(!"0".equals(contractIdCode)){
+                    String message = hashMap.get("message").toString();
+                    message = message.replaceAll(contractId + ";","");
+                    hashMap.put("message" , message);
+                    return hashMap;
+                }
+            }
+        }
+
         return hashMap;
     }
 

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

@@ -479,7 +479,7 @@ public class RuralProjectRecordTwoService  extends CrudService<RuralProjectMessa
         //序号
         int count=1;
         //成果文件
-        if (ruralProjectcontentinfo.getFileAttachmentList().size()>0){
+        if (null != ruralProjectcontentinfo.getFileAttachmentList() && ruralProjectcontentinfo.getFileAttachmentList().size()>0){
             List<ProjectTemplateInfo> infos=ruralProjectcontentinfo.getFileAttachmentList();
             for (int i=0;i<infos.size();i++){
                 if (null != infos.get(i).getWorkAttachments() && infos.get(i).getWorkAttachments().size()>0){
@@ -497,7 +497,7 @@ public class RuralProjectRecordTwoService  extends CrudService<RuralProjectMessa
             }
         }
         //依据性文件
-        if (ruralProjectcontentinfo.getFileGistdataList().size()>0){
+        if (null != ruralProjectcontentinfo.getFileGistdataList() && ruralProjectcontentinfo.getFileGistdataList().size()>0){
             List<ProjectTemplateInfo> infos=ruralProjectcontentinfo.getFileGistdataList();
             for (int i=0;i<infos.size();i++){
                 if (null != infos.get(i).getWorkAttachments() && infos.get(i).getWorkAttachments().size()>0){
@@ -515,7 +515,7 @@ public class RuralProjectRecordTwoService  extends CrudService<RuralProjectMessa
             }
         }
         //其它文件
-        if (ruralProjectcontentinfo.getFileGistdataList().size()>0){
+        if (null != ruralProjectcontentinfo.getFileOtherList() && ruralProjectcontentinfo.getFileOtherList().size()>0){
             List<ProjectTemplateInfo> infos=ruralProjectcontentinfo.getFileOtherList();
             for (int i=0;i<infos.size();i++){
                 if (null != infos.get(i).getWorkAttachments() && infos.get(i).getWorkAttachments().size()>0){

src/main/java/com/jeeplus/modules/ruralprojectrecords/thread/ApprovalThread.java

@@ -9,12 +9,10 @@ import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.ruralprojectrecords.dao.RuralProjectMessageElectronicSealDao;
 import com.jeeplus.modules.ruralprojectrecords.entity.ProjectApprovalSignature;
-import com.jeeplus.modules.ruralprojectrecords.entity.ProjectReportSignature;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.enums.ProjectStatusEnum;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageService;
 import com.jeeplus.modules.sys.entity.Office;
-import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -24,7 +22,6 @@ import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
 import com.jeeplus.modules.workprojectnotify.util.UtilNotify;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.File;
 import java.util.Date;
@@ -173,7 +170,7 @@ public class ApprovalThread extends Thread {
                             //将空白单的documentId存入数据库种
                             projectReportData.setSignatureInvalidDocumentId(String.join(",", invalidDocumentList));
                             //根据项目id 和 documentId生成合同id
-                            HashMap contractIdHashMap = ruralProjectMessageService.getSignatureContractId(ruralProjectRecords.getId(), documentList,ruralProjectRecords.getProjectMasterId(),"");
+                            HashMap contractIdHashMap = ruralProjectMessageService.getSignatureContractId1(ruralProjectRecords.getId(), documentList,ruralProjectRecords.getProjectMasterId(),"");
                             String contractIdCode = contractIdHashMap.get("code").toString();
                             String contractId = "";
                             if("0".equals(contractIdCode)){

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

@@ -188,12 +188,12 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         logger.info("-----------部门级—月度报表（开始）------------------");
         statementCompanyComprehensiveService.disposeStatementOffice(year,2,month);
         logger.info("------------部门级—月度报表（结束）------------------");
-        /*logger.info("------------公司级—年度报表（开始)------------------");
+        logger.info("------------公司级—年度报表(月报中年度信息)（开始)------------------");
         statementCompanyComprehensiveService.disposeStatementCompanyByYear(year,0,month);
-        logger.info("------------公司级—年度报表（结束）------------------");
-        logger.info("-----------部门级—年度报表（开始）------------------");
+        logger.info("------------公司级—年度报表(月报中年度信息)（结束）------------------");
+        logger.info("-----------部门级—年度报表(月报中年度信息)（开始）------------------");
         statementCompanyComprehensiveService.disposeStatementOfficeByYear(year,0,month);
-        logger.info("------------部门级—年度报表（结束）------------------");*/
+        logger.info("------------部门级—年度报表(月报中年度信息)（结束）------------------");
         logger.info("-----------张静—月度报表（开始）------------------");
         statementCompanyComprehensiveService.disposeReportDataStatementCompany(year,2,month);
         logger.info("------------张静—月度报表（结束）------------------");
@@ -225,6 +225,34 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
     }
 
     /**
+     * 报表处理(月报中年报的处理规则测试)
+     * @return
+     */
+    @RequestMapping(value = "/annualReportView")
+    @ResponseBody
+    @Transactional(readOnly = false)
+    public Map<String,Object> annualReportView(){
+        Map<String,Object> map = new HashMap<>();
+        final Calendar c = Calendar.getInstance();
+        Integer year = c.get(Calendar.YEAR);
+        System.out.println(c.get(Calendar.DATE));
+        System.out.println(c.getActualMaximum(Calendar.DATE));
+        long l1 = System.currentTimeMillis();
+        Integer month = c.get(Calendar.MONTH); //第一个月从0开始，所以得到月份＋1
+        //当月最后一天
+        logger.info("------------公司级—年度报表(月报中年度信息)（开始)------------------");
+        statementCompanyComprehensiveService.disposeStatementCompanyByYear(year,0,month);
+        logger.info("------------公司级—年度报表(月报中年度信息)（结束）------------------");
+        logger.info("-----------部门级—年度报表(月报中年度信息)（开始）------------------");
+        statementCompanyComprehensiveService.disposeStatementOfficeByYear(year,0,month);
+        logger.info("------------部门级—年度报表(月报中年度信息)（结束）------------------");
+        map.put("msgMonth","月度报表处理完成");
+        long l2 = System.currentTimeMillis();
+        map.put("msgdate",(l2-l1));
+        return map;
+    }
+
+    /**
      * 报表处理
      * @return
      */

src/main/java/com/jeeplus/modules/statement/service/StatementCompanyComprehensiveService.java

@@ -624,7 +624,7 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
             year = cal.get(Calendar.YEAR);
         }
 
-        Map<String, String> dateMap = getDateNew(bigDateType, smallDateType, year);
+        Map<String, String> dateMap = getYearDate( smallDateType, year);
         //开始时间
         String beginDate = dateMap.get("beginDate");
         //结束时间
@@ -643,7 +643,7 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
 
         //创建utilNotifyId参数
         //参数是由 year、bigDateType、smallDateType参数设定
-        String utilNotifyId = year + "," + bigDateType + "," + smallDateType;
+        /*String utilNotifyId = year + "," + bigDateType + "," + smallDateType;
         //发送通知
         switch (bigDateType){
             //年度汇总
@@ -660,7 +660,7 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
                 //smallDateType  为月度时候
                 companyNotification(statementDate,"月","163",utilNotifyId);
                 break;
-        }
+        }*/
     }
 
     /**
@@ -1922,6 +1922,45 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         return map;
     }
 
+    /**
+     * 根据状态获取查询得开始和结束时间   获取精确的年月日
+     * @param smallDateType 状态2（针对状态1进行精确所在指定季度或者月份）
+     * @param year
+     * @return
+     */
+    public Map<String,String> getYearDate(Integer smallDateType,Integer year){
+        Map<String,String> map = new HashMap();
+//        Calendar cal = Calendar.getInstance();
+//        //获取当前年份
+//        int year = cal.get(Calendar.YEAR);
+        String statementDate = year + "年1月-" + smallDateType + "月";
+        String endDate = "";
+        String beginDate = year + "-01-01 00:00:00";
+
+        switch (smallDateType){
+            case 1:
+            case 2:
+            case 3:
+            case 4:
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+                endDate = year + "-0" + smallDateType + "-31 23:59:59";
+                break;
+            case 10:
+            case 11:
+            case 12:
+                endDate = year + "-" + smallDateType + "-31 23:59:59";
+                break;
+        }
+        map.put("beginDate",beginDate);
+        map.put("endDate",endDate);
+        map.put("statementDate",statementDate);
+        return map;
+    }
+
 
     /**
      * 部门级信息处理
@@ -2829,7 +2868,7 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
             year = cal.get(Calendar.YEAR);
         }
 
-        Map<String, String> dateMap = getDateNew(bigDateType, smallDateType,year);
+        Map<String, String> dateMap = getYearDate( smallDateType,year);
         //开始时间
         String beginDate = dateMap.get("beginDate");
         //结束时间
@@ -2848,7 +2887,7 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
 
         //创建utilNotifyId参数
         //参数是由 year、bigDateType、smallDateType参数设定
-        String utilNotifyId = year + "," + bigDateType + "," + smallDateType;
+        /*String utilNotifyId = year + "," + bigDateType + "," + smallDateType;
         //发送通知
         switch (bigDateType){
             //年度汇总
@@ -2865,7 +2904,7 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
                 //smallDateType  为月度时候
                 officeNotification(statementDate,"月","166",utilNotifyId);
                 break;
-        }
+        }*/
     }
 
     /**

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

@@ -164,15 +164,15 @@ public class WorkCalendarTaskService  {
             logger.info("-----------公司级—月度报表（开始）------------------");
             statementCompanyComprehensiveService.disposeStatementCompany(year,2,month);
             logger.info("------------公司级—月度报表（结束）------------------");
-            /*logger.info("------------公司级—年度报表（开始)------------------");
+            logger.info("------------公司级—年度报表(月报中年度信息)（开始)------------------");
             statementCompanyComprehensiveService.disposeStatementCompanyByYear(year,0,month);
-            logger.info("------------公司级—年度报表（结束）------------------");*/
+            logger.info("------------公司级—年度报表(月报中年度信息)（结束）------------------");
             logger.info("-----------部门级—月度报表（开始）------------------");
             statementCompanyComprehensiveService.disposeStatementOffice(year,2,month);
             logger.info("------------部门级—月度报表（结束）------------------");
-            /*logger.info("-----------部门级—年度报表（开始）------------------");
+            logger.info("-----------部门级—年度报表(月报中年度信息)（开始）------------------");
             statementCompanyComprehensiveService.disposeStatementOfficeByYear(year,0,month);
-            logger.info("------------部门级—年度报表（结束）------------------");*/
+            logger.info("------------部门级—年度报表(月报中年度信息)（结束）------------------");
             logger.info("-----------张静—月度报表（开始）------------------");
             statementCompanyComprehensiveService.disposeReportDataStatementCompany(year,2,month);
             logger.info("------------张静—月度报表（结束）------------------");

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

@@ -882,6 +882,7 @@ public class WorkFullManageService extends CrudService<WorkFullManageDao, WorkFu
 		TwoDimensionCode.encoderQRCode(querySite, qrCodePath, "png");//执行生成二维码
 		String imageStr = ImageUtil.getImageStr(qrCodePath);
 		data.put("qrcode",imageStr);
+		data.put("qrCodePath",qrCodePath);
 
 		return data;
 	}

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -885,16 +885,23 @@ public class WorkFullManageController extends BaseController {
 		data.put("repYear",list.get(1));
 		data.put("repNum",list.get(2));
 		data.put("querySite","ccpm.xgccpm.com");
+		String qrCodePath = (String) data.get("qrCodePath");
+		try{
+			FreemarkerUtil.generateFile(data,template,docFile);
 
-		FreemarkerUtil.generateFile(data,template,docFile);
-
-		ResponseUtil.docResponse(FILE_NAME,docFile,response);
-
-		/*if(docFile != null) docFile.delete(); // 删除doc临时文件
-		File imageFile = new File(qrCodePath);
-		if(imageFile.exists() && imageFile.isFile()) {
-			imageFile.delete();//删除二维码图片临时文件
-		}*/
+			ResponseUtil.docResponse(FILE_NAME,docFile,response);
+		} catch (Exception ex) {
+			ex.printStackTrace();
+			throw new RuntimeException(ex);
+		}finally {
+			if(docFile != null) docFile.delete(); // 删除doc临时文件
+			if(StringUtils.isNotBlank(qrCodePath)){
+				File imageFile = new File(qrCodePath);
+				if(imageFile.exists() && imageFile.isFile()) {
+					imageFile.delete();//删除二维码图片临时文件
+				}
+			}
+		}
 	}
 
 	/**

src/main/resources/mappings/modules/sys/UserDao.xml

@@ -429,8 +429,11 @@
 		left join sys_office so on so.id = a.office_id
 		LEFT JOIN work_staff_achives uo ON uo.user_id = a.id
 		LEFT JOIN sys_office o ON o.id = uo.office_id
+		left join work_staff_basic_info wsbi on wsbi.user_id = a.id
 		WHERE a.del_flag = #{DEL_FLAG_NORMAL}
+		and a.login_flag = 1
 		AND o.del_flag = #{DEL_FLAG_NORMAL}
+		AND wsbi.del_flag = #{DEL_FLAG_NORMAL}
 		<if test="office != null and office.id != null and office.id !='' ">
 			AND uo.office_id = #{office.id}
 		</if>
@@ -450,8 +453,11 @@
 		left join sys_office so on so.id = a.office_id
 		LEFT JOIN work_staff_achives uo ON uo.user_id = a.id
 		LEFT JOIN sys_office o ON o.id = uo.office_id
+		left join work_staff_basic_info wsbi on wsbi.user_id = a.id
 		WHERE a.del_flag = #{DEL_FLAG_NORMAL}
+		and a.login_flag = 1
 		AND o.del_flag = #{DEL_FLAG_NORMAL}
+		AND wsbi.del_flag = #{DEL_FLAG_NORMAL}
 		<if test="office != null and office.id != null and office.id !='' ">
 			AND uo.office_id = #{office.id}
 		</if>

src/main/webapp/webpage/modules/ruralprojectrecords/view/projectAccessoryView.jsp

@@ -251,15 +251,15 @@
 													<c:when test="${projectcontentinfo.uploadMode == 2}">
 														<c:choose>
 															<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 															</c:when>
 															<c:otherwise>
-																<a href="${fileAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 															</c:otherwise>
 														</c:choose>
 													</c:when>
 													<c:otherwise>
-														<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.temporaryUrl}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+														<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 													</c:otherwise>
 												</c:choose>
 												<c:if test="${fileAttachment.collectFlag != 1}">

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

@@ -598,7 +598,7 @@
 						</shiro:hasPermission>
 						<button class="layui-btn layui-btn-sm layui-bg-green" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 						<div class=" layui-btn-sm" style="float: right;width: 300px">
-							<span style="color: red">金额汇总(开票金额)：${sumMoney}(元)</span>
+							<span style="color: #999999">金额汇总(开票金额)：${sumMoney}(元)</span>
 						</div>
 					</div>
 					<%--<shiro:hasPermission name="workinvoice:workInvoice:del">

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

@@ -681,7 +681,7 @@
 						</shiro:hasPermission>
 						<button class="layui-btn layui-btn-sm layui-bg-green" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 						<div class=" layui-btn-sm" style="float: right;width: 300px">
-							<span style="color: red">金额汇总(开票金额)：${sumMoney}(元)</span>
+							<span style="color: #999999">金额汇总(开票金额)：${sumMoney}(元)</span>
 						</div>
 					</div>
 					<%--<shiro:hasPermission name="workinvoice:workInvoice:del">

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

@@ -624,7 +624,7 @@
 						</shiro:hasPermission>
 						<button class="layui-btn layui-btn-sm layui-bg-green" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 						<div class=" layui-btn-sm" style="float: right;width: 300px">
-							<span style="color: red">金额汇总(开票金额)：${sumMoney}(元)</span>
+							<span style="color: #999999">金额汇总(开票金额)：${sumMoney}(元)</span>
 						</div>
 					</div>
 

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

@@ -696,7 +696,7 @@
 						</shiro:hasPermission>
 						<button class="layui-btn layui-btn-sm layui-bg-green" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 						<div class=" layui-btn-sm" style="float: right;width: 300px">
-							<span style="color: red">金额汇总(开票金额)：${sumMoney}(元)</span>
+							<span style="color: #999999">金额汇总(开票金额)：${sumMoney}(元)</span>
 						</div>
 					</div>