日志

adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java

@@ -6,13 +6,16 @@ import com.adc.da.common.SarConformStateEnum;
 import com.adc.da.common.SarStateColorEnum;
 import com.adc.da.common.SarTypeEnum;
 import com.adc.da.http.ResponseMessage;
+import com.adc.da.login.util.UserUtils;
 import com.adc.da.slrs.SarCompResAssess.entity.SarCompResAssess;
 import com.adc.da.slrs.SarCompResAssess.service.ISarCompResAssessService;
 import com.adc.da.slrs.SarCompStatusInfo.dao.SarCompStatusInfoDao;
 import com.adc.da.slrs.SarCompStatusInfo.entity.SarCompStatusInfo;
 import com.adc.da.slrs.SarFileSplitItems.service.ISarFileSplitItemsService;
 import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao;
+import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanLogDao;
 import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
+import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanLog;
 import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
 import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
 import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService;
@@ -98,6 +101,9 @@ public class ActSarItemsBussEOService {
     @Value("${elas.flag}")
     private boolean elasflag;
 
+    @Autowired
+    private EsRevisePlanLogDao esRevisePlanLogDao;
+
 
     public void processCreateFsBuss(String standJson) throws Exception {
         Map<String,Object> standMap = new HashMap();
@@ -184,6 +190,7 @@ public class ActSarItemsBussEOService {
                 esRevisePlanDTO.setArea(SYCXCLASS);
                 esRevisePlanDTO.setRqbName(DTQBBHBUSS);
                 esRevisePlanDTO.setLxd(LXD);
+                esRevisePlanDTO.setLogType("复审");
 
                 EsRevisePlan qw = new EsRevisePlan();
                 qw.setEsName(standName);
@@ -192,6 +199,13 @@ public class ActSarItemsBussEOService {
                 if(!list.isEmpty()){
                     esRevisePlanDTO.setId(list.get(0).getId());
                     iEsRevisePlanService.updateById(esRevisePlanDTO);
+                    //日志
+                    String esName = list.get(0).getEsName();
+                    String id = list.get(0).getId();
+                    Date date = new Date();
+                    String msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " "
+                                +"创建了《"+ esName +"》,其计划结果为复审";
+                    esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date));
                 }else{
                     iEsRevisePlanService.addPlan(esRevisePlanDTO);
                 }

adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsPlanService.java

@@ -1,7 +1,10 @@
 package com.adc.da.workFlow.service;
 
+import com.adc.da.login.util.UserUtils;
 import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao;
+import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanLogDao;
 import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
+import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanLog;
 import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
 import com.adc.da.util.UUIDUtils;
 import com.adc.da.workFlow.dao.ActSarItemsEODao;
@@ -16,10 +19,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
+import java.text.SimpleDateFormat;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
 
 @Service("actSarItemsPlanService")
 @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
@@ -33,6 +34,9 @@ public class ActSarItemsPlanService {
     @Autowired
     private EsRevisePlanDao esRevisePlanDao;
 
+    @Autowired
+    private EsRevisePlanLogDao esRevisePlanLogDao;
+
 
     @Value("${elas.flag}")
     private boolean elasflag;
@@ -78,11 +82,21 @@ public class ActSarItemsPlanService {
                     id = UUIDUtils.randomUUID(32);
                     esRevisePlanDTO.setId(id);
                     esRevisePlanDao.insertOne(esRevisePlanDTO);
+                    //日志
+                    Date date = new Date();
+                    String msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " "
+                            +"创建了《"+ object.getString("esName") +"》";
+                    esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date));
                 }
             }else {
                 id = UUIDUtils.randomUUID(32);
                 esRevisePlanDTO.setId(id);
                 esRevisePlanDao.insertOne(esRevisePlanDTO);
+                //日志
+                Date date = new Date();
+                String msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " "
+                        +"创建了《"+ object.getString("esName") +"》";
+                esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date));
             }
         }
         return id;

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java

@@ -156,4 +156,7 @@ public class EsRevisePlan extends BasePage {
 
     @TableField(exist = false)
     private String processType;
+
+    @TableField(exist = false)
+    private String logType;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java

@@ -161,8 +161,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
             String esName = esRevisePlan.getEsName();
             String id = esRevisePlan.getId();
             Date date = new Date();
-            String msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " "
+            String msg;
-                    +"创建了《"+ esName +"》";
+            if ("复审".equals(esRevisePlan.getLogType())) {
+                msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " "
+                        +"创建了《"+ esName +"》,其计划结果为复审";
+            } else {
+                msg = UserUtils.getUser().getUname() + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date) + " "
+                        +"创建了《"+ esName +"》";
+            }
             esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date));
             return "操作成功";
         }