Merge remote-tracking branch 'origin/master'

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

@@ -10,6 +10,7 @@ import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectSignatureOldMessageDisposeService;
+import com.jeeplus.modules.statement.service.StatementCompanyComprehensiveService;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
@@ -50,6 +51,8 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
     @Autowired
     private RuralProjectSignatureOldMessageDisposeService service;
 
+    @Autowired
+    private StatementCompanyComprehensiveService statementCompanyComprehensiveService;
 
     private static final String HTTPTOP = Global.getConfig("signature_http_top");
 
@@ -136,4 +139,52 @@ public class RuralProjectSignatureOldMessageDisposeController extends BaseContro
         return map;
     }
 
+    /**
+     * 报表处理
+     * @return
+     */
+    @RequestMapping(value = "/reportView")
+    @ResponseBody
+    @Transactional(readOnly = false)
+    public Map<String,Object> reportView(){
+        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));
+        //if (c.get(Calendar.DATE) == c.getActualMaximum(Calendar.DATE)){
+
+        Integer month = c.get(Calendar.MONTH)+1; //第一个月从0开始，所以得到月份＋1
+        //当月最后一天
+        logger.info("-----------公司级—月度报表（开始）------------------");
+        statementCompanyComprehensiveService.disposeStatementCompany(2021,2,12);
+        logger.info("------------公司级—月度报表（结束）------------------");
+        logger.info("-----------部门级—月度报表（开始）------------------");
+        statementCompanyComprehensiveService.disposeStatementOffice(2021,2,12);
+        logger.info("------------部门级—月度报表（结束）------------------");
+        //}
+
+        map.put("msgMonth","月度报表处理完成");
+
+        logger.info("-----------公司级—季度报表（开始）------------------");
+        statementCompanyComprehensiveService.disposeStatementCompany(2021,1,4);
+        logger.info("------------公司级—季度报表（结束）------------------");
+        logger.info("-----------部门级—季度报表（开始）------------------");
+        statementCompanyComprehensiveService.disposeStatementOffice(2021,1,4);
+        logger.info("------------部门级—季度报表（结束）------------------");
+
+        map.put("msgQuarter","季度报表处理完成");
+
+        logger.info("-----------公司级—年度报表（开始）------------------");
+        statementCompanyComprehensiveService.disposeStatementCompany(2021,0,0);
+        logger.info("------------公司级—年度报表（结束）------------------");
+        logger.info("-----------部门级—年度报表（开始）------------------");
+        statementCompanyComprehensiveService.disposeStatementOffice(2021,0,0);
+        logger.info("------------部门级—年度报表（结束）------------------");
+
+        map.put("msgYear","年度报表处理完成");
+
+        return map;
+    }
+
 }

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

@@ -147,7 +147,7 @@ public class WorkCalendarTaskService  {
      */
     //每个月最后一天晚上23点推送
     //@Scheduled(cron= "0 0 23 28-31 * ?")
-    @Scheduled(cron= "0 0/2 * * * ?")
+    @Scheduled(cron= "0 01 17 * * ?")
     @Transactional(readOnly = false)
     public void getStatementCompanyComprehensiveOnMonth() {
         final Calendar c = Calendar.getInstance();
@@ -173,7 +173,7 @@ public class WorkCalendarTaskService  {
      */
     //每个季度最后一天晚上23点推送
     //@Scheduled(cron= "0 0 23 28-31 3,6,9,12 ?")
-    @Scheduled(cron= "0 0/2 * * * ?")
+    @Scheduled(cron= "0 02 17 * * ?")
     @Transactional(readOnly = false)
     public void getStatementCompanyComprehensiveOnQuarter() {
         final Calendar c = Calendar.getInstance();
@@ -196,7 +196,7 @@ public class WorkCalendarTaskService  {
      */
     //每年最后一天晚上23点推送
     //@Scheduled(cron= "0 0 23 31 12 ?")
-    @Scheduled(cron= "0 0/2 * * * ?")
+    @Scheduled(cron= "0 03 17 * * ?")
     @Transactional(readOnly = false)
     public void getStatementCompanyComprehensiveOnYear() {
         final Calendar c = Calendar.getInstance();

src/main/java/com/jeeplus/modules/workcontractrecord/entity/WorkContractRecord.java

@@ -25,7 +25,7 @@ import java.util.Map;
  * @version 2018-06-08
  */
 public class WorkContractRecord extends ActEntity<WorkContractRecord> {
-	
+
 	private static final long serialVersionUID = 1L;
 	private String processInstanceId;		// 流程号
 	private String officeId;		// 部门ID
@@ -49,6 +49,7 @@ public class WorkContractRecord extends ActEntity<WorkContractRecord> {
 	private HistoricProcessInstance historicProcessInstance;
 	// 流程定义
 	private ProcessDefinition processDefinition;
+	private Date accomplishDate;		// 审核通过时间
 
 	public Task getTask() {
 		return task;
@@ -138,7 +139,7 @@ public class WorkContractRecord extends ActEntity<WorkContractRecord> {
 	public void setProcessInstanceId(String processInstanceId) {
 		this.processInstanceId = processInstanceId;
 	}
-	
+
 	@ExcelField(title="部门ID", align=2, sort=8)
 	public String getOfficeId() {
 		return officeId;
@@ -147,7 +148,7 @@ public class WorkContractRecord extends ActEntity<WorkContractRecord> {
 	public void setOfficeId(String officeId) {
 		this.officeId = officeId;
 	}
-	
+
 	@ExcelField(title="公司ID", align=2, sort=9)
 	public String getCompanyId() {
 		return companyId;
@@ -156,7 +157,7 @@ public class WorkContractRecord extends ActEntity<WorkContractRecord> {
 	public void setCompanyId(String companyId) {
 		this.companyId = companyId;
 	}
-	
+
 	@ExcelField(title="合同", align=2, sort=10)
 	public WorkContractInfo getWorkContractInfo() {
 		return workContractInfo;
@@ -165,7 +166,7 @@ public class WorkContractRecord extends ActEntity<WorkContractRecord> {
 	public void setWorkContractInfo(WorkContractInfo workContractInfo) {
 		this.workContractInfo = workContractInfo;
 	}
-	
+
 	@ExcelField(title="归档申请编号", align=2, sort=11)
 	public String getRecordNum() {
 		return recordNum;
@@ -174,7 +175,7 @@ public class WorkContractRecord extends ActEntity<WorkContractRecord> {
 	public void setRecordNum(String recordNum) {
 		this.recordNum = recordNum;
 	}
-	
+
 	@ExcelField(title="档案号", align=2, sort=12)
 	public String getFileNum() {
 		return fileNum;
@@ -183,7 +184,7 @@ public class WorkContractRecord extends ActEntity<WorkContractRecord> {
 	public void setFileNum(String fileNum) {
 		this.fileNum = fileNum;
 	}
-	
+
 	@ExcelField(title="说明", align=2, sort=13)
 	public String getInstruction() {
 		return instruction;
@@ -192,7 +193,7 @@ public class WorkContractRecord extends ActEntity<WorkContractRecord> {
 	public void setInstruction(String instruction) {
 		this.instruction = instruction;
 	}
-	
+
 	@ExcelField(title="审核状态", align=2, sort=14)
 	public String getStatus() {
 		return status;
@@ -209,4 +210,12 @@ public class WorkContractRecord extends ActEntity<WorkContractRecord> {
 	public void setFileNumTow(String fileNumTow) {
 		this.fileNumTow = fileNumTow;
 	}
+
+	public Date getAccomplishDate() {
+		return accomplishDate;
+	}
+
+	public void setAccomplishDate(Date accomplishDate) {
+		this.accomplishDate = accomplishDate;
+	}
 }

src/main/java/com/jeeplus/modules/workcontractrecord/service/WorkContractRecordService.java

@@ -478,6 +478,7 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 				users.add(workContractRecord.getCreateBy());
 				if ("yes".equals(workContractRecord.getAct().getFlag())) {
 					workContractRecord.setStatus("5");
+					workContractRecord.setAccomplishDate(new Date());
 					WorkProjectNotify notify = new WorkProjectNotify();
 					notify.setNotifyId(workContractRecord.getId());
 					userList = workProjectNotifyService.readByNotifyId(notify);

src/main/resources/mappings/modules/workcontractrecord/WorkContractRecordDao.xml

@@ -227,6 +227,9 @@
 			file_num_tow = #{fileNumTow},
 			instruction = #{instruction},
 			status = #{status}
+			<if test="accomplishDate != null and accomplishDate != ''">
+				,accomplish_date = #{accomplishDate}
+			</if>
 		WHERE id = #{id}
 	</update>