Merge remote-tracking branch 'origin/develop_master' into develop_3

adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java

@@ -186,8 +186,8 @@ public class ProcessTimer {
         }
     }
 
-//    @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行
+    @Scheduled(cron = "0 0 10 * * ? ")//每天十点执行
-    @Scheduled(cron = "0 0 0/1 * * ? ")//每天十点执行
+//    @Scheduled(cron = "0 0 0/1 * * ? ")//每天十点执行
 //    @Scheduled(cron = "*/40 * * * * ? ")//20s
     public void everyDayTenOlockScanSAM() {
         List<BusProcessNew> busProcessNews=new ArrayList<>();

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

@@ -161,7 +161,7 @@ public class ActSarItemsBussEOService {
                 iSarBussionessStandService.attrInfoDetails(query);
                 Map<String, Object> attrInfoMap = query.getAttrInfoMap();
                 if(attInfoMap!=null && !attInfoMap.isEmpty()){
-                    updateStandFileFieldData(attInfoMap,attrInfoMap);
+//                    updateStandFileFieldData(attInfoMap,attrInfoMap);
                     resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
                     sarBussionessStand.setSarStandAttrEOStr(resData);
                 }
@@ -192,7 +192,7 @@ public class ActSarItemsBussEOService {
                 iSarBussionessStandService.attrInfoDetails(query);
                 Map<String, Object> attrInfoMap = query.getAttrInfoMap();
                 if(attInfoMap!=null && !attInfoMap.isEmpty()){
-                    updateStandFileFieldData(attInfoMap,attrInfoMap);
+//                    updateStandFileFieldData(attInfoMap,attrInfoMap);
                     resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
                     sarBussionessStand.setSarStandAttrEOStr(resData);
                 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -473,15 +473,18 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         if (StringUtils.isNotBlank(attrStr)) {
             newMap = JSONObject.fromObject(attrStr);
         }
-        newMap = changeMap(sarStandardsInfoEO,newMap);
+        if(newMap != null && oldMap != null) {
-        oldMap = changeMap(beforeSarStandardsInfo,oldMap);
+            newMap = changeMap(sarStandardsInfoEO,newMap);
-        String sortName = sysInfoEOService.getDicNamesByCodes(sarStandardsInfoEO.getStandSort());
+            oldMap = changeMap(beforeSarStandardsInfo,oldMap);
-        String number = sortName + " " + sarStandardsInfoEO.getStandCode();
+            String sortName = sysInfoEOService.getDicNamesByCodes(sarStandardsInfoEO.getStandSort());
-        if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
+            String number = sortName + " " + sarStandardsInfoEO.getStandCode();
-            number += "-" + sarStandardsInfoEO.getStandYear();
+            if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
+                number += "-" + sarStandardsInfoEO.getStandYear();
+            }
+            String content = number + " 《" + sarStandardsInfoEO.getStandName() + "》";
+            sarUpdLogEOService.createUpdateLog(SarTypeEnum.BUSINESS.getValue(),sarStandardsInfoEO.getId(),oldMap,newMap,content);
+
         }
-        String content = number + " 《" + sarStandardsInfoEO.getStandName() + "》";
-        sarUpdLogEOService.createUpdateLog(SarTypeEnum.BUSINESS.getValue(),sarStandardsInfoEO.getId(),oldMap,newMap,content);
     }
 
     public Map<String,Object> changeMap (SarBussionessStand sarStandardsInfoEO,Map<String,Object> map) {

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java

@@ -123,6 +123,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
             Map<String,String> map=new HashMap<>();
             map.put("1","上报");
             map.put("2","处理后上报");
+            map.put("3","不上报");
             String fileName = URLEncoder.encode(textName, "UTF-8").replaceAll("\\+", "%20");
             response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
             List<SarPublicIdeaAll> data=new ArrayList<>();
@@ -156,6 +157,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
                             .reason(sarPublicIdeaAll.getReason())
                             .userName(sarPublicIdeaAll.getUserName())
                             .deptName(sarPublicIdeaAll.getDeptName())
+                            .state(map.get(sarPublicIdeaAll.getState()))
                             .cause(sarPublicIdeaAll.getCause())
                             .build();
                     standExcel.add(getExcelDto);
@@ -169,9 +171,7 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
             headList.add(Lists.newArrayList("修改意见内容(包括理由或依据)","修改理由"));
             headList.add(Lists.newArrayList("提出部门"));
             headList.add(Lists.newArrayList("提出人"));
-            if ("1".equals(type)){
+            headList.add(Lists.newArrayList("处理意见"));
-                headList.add(Lists.newArrayList("处理意见"));
-            }
             headList.add(Lists.newArrayList("原因"));
             if ("1".equals(type)) {
                 EasyExcel.write(response.getOutputStream(), GetExcelDto2.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java

@@ -74,10 +74,10 @@ public class SarPublicIdeaController extends BaseController<SarPublicIdea> {
 //            c.add(Calendar.DAY_OF_MONTH, 1);// 今天+1天
 //            sarPublicIdea.setStartTime(c.getTime());
 //
-//            Calendar c2 = Calendar.getInstance();
+            Calendar c2 = Calendar.getInstance();
-//            c2.setTime(sarPublicIdea.getEndTime());
+            c2.setTime(sarPublicIdea.getEndTime());
-//            c2.add(Calendar.DAY_OF_MONTH, 2);// 今天+1天
+            c2.add(Calendar.DAY_OF_MONTH, 1);// 今天+1天
-//            sarPublicIdea.setEndTime(c2.getTime());
+            sarPublicIdea.setEndTime(c2.getTime());
 
             sarPublicIdeaService.save(sarPublicIdea);
         }catch(Exception e){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/entity/GetExcelDto.java

@@ -38,6 +38,8 @@ public class GetExcelDto {
 //    @ExcelProperty("提出人")
     private String userName;
 
+    private String state;
+
     private String cause;
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java

@@ -59,7 +59,7 @@ public class SarStandardComplianceAssessResultController {
         if (eo.getStandApplicationType() == 1) {
             QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
             IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
-            queryWrapper.select("distinct STAND_ID, STAND_NUMBER, STAND_NAME, STAND_TYPE");
+            queryWrapper.select(" STAND_ID,ANY_VALUE(STAND_NUMBER) as STAND_NUMBER, STAND_NAME, STAND_TYPE");
             if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
                 queryWrapper.like("STAND_NAME", eo.getStandName().trim());
             }
@@ -69,6 +69,7 @@ public class SarStandardComplianceAssessResultController {
             if (eo.getType() != null && !eo.getType().trim().equals("")) {
                 queryWrapper.like("type", eo.getType().trim());
             }
+            queryWrapper.groupBy("STAND_ID,STAND_NAME,STAND_TYPE");
             IPage<SarStandardComplianceProductAssess> page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper);
 
             while (page.getRecords().remove(null)) ;

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarFileSplitItemsValEO.java

@@ -3,6 +3,8 @@ package com.adc.da.slrs.standardSplit.entity;
 import com.adc.da.base.entity.BaseEntity;
 import com.adc.da.common.UploadFileInfo;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
 import java.util.Date;
 import java.util.List;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarItemsCompareHisEO.java

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.standardSplit.entity;
 
 import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.util.Date;
@@ -11,6 +12,7 @@ import java.util.Date;
  * <b>日期：</b> 2020-02-26 <br>
  * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
  */
+@TableName("sar_items_compare_his")
 public class SarItemsCompareHisEO extends BaseEntity {
 
     private String id;

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java

@@ -384,6 +384,7 @@ public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService
         sarFileSplitItemsEO.setCreationUser(LoginUserUtil.getUserId());
         sarFileSplitItemsEO.setModifyUser(LoginUserUtil.getUserId());
         sarFileSplitItemsEO.setEditFlag(String.valueOf(UUID.randomUUID()));
+        sarFileSplitItemsEO.setWorkFlowShow(sarFileSplitItemsEO.getWorkFlowShow());
         result += sarFileSplitItemsEODao.insertSelective(sarFileSplitItemsEO);
 
         // SAR_FILE_ITEMS_VAL   添加数据，

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml

@@ -11,7 +11,7 @@
         INNER JOIN sar_public_idea_all on sar_public_idea_all.idea_id = sar_public_idea.id
         left join ts_user on ts_user.USID = sar_public_idea_all.user_id
         left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
-        WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique} and sar_public_idea_all.wk_flag is null
+        WHERE sar_public_idea_all.idea_id IS NOT NULL and sar_public_idea.uniques = #{unique}
     </select>
 
     <select id="getAllDataByIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
@@ -23,14 +23,14 @@
          left join ts_user on sar_public_idea_all.user_id=ts_user.USID
          left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
          WHERE
-         sar_public_idea_all.idea_id = #{ideaId} and sar_public_idea_all.wk_flag is null
+         sar_public_idea_all.idea_id = #{ideaId}
          LIMIT ${(page-1)*size},${size}
     </select>
 
     <select id="getAllDataByIdeaCount" resultType="java.lang.Integer">
          SELECT count(id)
          FROM sar_public_idea_all WHERE
-         idea_id = #{ideaId} and sar_public_idea_all.wk_flag is null
+         idea_id = #{ideaId}
     </select>
 
     <select id="getPublicAllIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">

adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitItemsEOMapper.xml

@@ -68,7 +68,7 @@
      SAR_FILE_SPLIT_ITEMS.fo,SAR_FILE_SPLIT_ITEMS.duty_engineer, SAR_FILE_SPLIT_ITEMS.claim_type,
      SAR_FILE_SPLIT_ITEMS.bus_stand_cover,SAR_FILE_SPLIT_ITEMS.file_type,SAR_FILE_SPLIT_ITEMS.responsible_unit,
      TS_ORG.org_name as responsibleUnitShow, dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.NAME as
-     dutyEngineerShow,tsFo.NAME as foShow
+     dutyEngineerShow,tsFo.NAME as foShow,SAR_FILE_SPLIT_ITEMS.work_flow_show AS workFlowShow
   </sql>
 
   <sql id="Base_Column_List2" >
@@ -211,6 +211,7 @@
                 <if test="claimType != null" >claim_type,</if>
                 <if test="busStandCover != null">bus_stand_cover,</if>
                 <if test="fileType != null">file_type,</if>
+                <if test="workFlowShow != null">work_flow_show,</if>
                 <if test="responsibleUnit != null">responsible_unit</if>
             </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -233,12 +234,13 @@
                 <if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if>
                 <if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
                 <if test="modifyUser != null" >#{modifyUser, jdbcType=VARCHAR},</if>
-                <if test="editFlag != null" >#{editFlag,jdbcType=VARCHAR}</if>
+                <if test="editFlag != null" >#{editFlag,jdbcType=VARCHAR},</if>
                 <if test="fo != null" >#{fo, jdbcType=VARCHAR},</if>
                 <if test="dutyEngineer != null" >#{dutyEngineer, jdbcType=VARCHAR},</if>
                 <if test="claimType != null" >#{claimType, jdbcType=VARCHAR},</if>
                 <if test="busStandCover != null" >#{busStandCover, jdbcType=VARCHAR},</if>
                 <if test="fileType != null" >#{fileType, jdbcType=VARCHAR},</if>
+                <if test="workFlowShow != null" >#{workFlowShow, jdbcType=VARCHAR},</if>
                 <if test="responsibleUnit != null" >#{responsibleUnit, jdbcType=VARCHAR}</if>
             </trim>
   </insert>
@@ -350,6 +352,9 @@
         <if test="responsibleUnit != null" >
             responsible_unit = #{responsibleUnit},
         </if>
+        <if test="workFlowShow != null" >
+            work_flow_show = #{workFlowShow},
+        </if>
     </set>
      where id = #{id}
   </update>