222、223 bug

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

@@ -18,6 +18,7 @@ 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.entity.SarBussStandAttrInfo;
 import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService;
 import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
 import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
@@ -150,17 +151,52 @@ public class ActSarItemsBussEOService {
             QueryWrapper wrapper = new QueryWrapper();
             wrapper.eq("STAND_ID",standId);
             List<SarBussionessStandState> stateList = bussionessStandStateService.list(wrapper);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Integer addYear = 0;
+            if (standSort.contains("Q/QCBFC")) {
+                addYear = 3;
+            }else {
+                addYear = 5;
+            }
+            Date FSDate = sdf.parse(issueTime);
+            if (ObjectUtils.isNotEmpty(reviewTime)) {
+                FSDate = new Date();
+            }
+
             if(!stateList.isEmpty()){
                 state.setId(stateList.get(0).getId());
+                if ("3".equals(reviewResults)) {
+                    Calendar cal = Calendar.getInstance();
+                    cal.setTime(FSDate);//设置起时间
+                    cal.add(Calendar.YEAR, addYear);//增加年份
+                    cal.add(Calendar.MONTH, -1);//减去一个月
+                    state.setReviewTime(sdf.format(cal.getTime()));
+                }
                 bussionessStandStateService.updateById(state);
             }else {
-                if(DateUtil.printToDate(reviewTime) != null){
+                if ("3".equals(reviewResults)) {
-                    state.setReviewTime(reviewTime);
+                    Calendar cal = Calendar.getInstance();
+                    cal.setTime(FSDate);//设置起时间
+                    cal.add(Calendar.YEAR, addYear);//增加年份
+                    cal.add(Calendar.MONTH, -1);//减去一个月
+                    state.setReviewTime(sdf.format(cal.getTime()));
                 }
                 state.setCreationTime(DateUtil.printDateAll(new Date()));
                 bussionessStandStateService.save(state);
             }
 
+            if ("3".equals(reviewResults)) {
+                List<SarBussStandAttrInfo> sarBussStandAttrInfos = sarBussStandAttrInfoService.list(wrapper);
+                if (ObjectUtils.isNotEmpty(sarBussStandAttrInfos)) {
+                    Calendar cal = Calendar.getInstance();
+                    cal.setTime(FSDate);//设置起时间
+                    cal.add(Calendar.YEAR, addYear);//增加年份
+                    cal.add(Calendar.MONTH, -1);//减去一个月
+                    SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfos.get(0);
+                    sarBussStandAttrInfoEODao.updateFSQR(sarBussStandAttrInfo.getId(),sdf.format(cal.getTime()));
+                }
+            }
+
 
             if(StringUtils.isNotBlank(standSort) && !standSort.contains("Q/QCBFC")){
                 String QCDWID = String.valueOf(standMap.get("QCDWID"));

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/dao/SarBussStandAttrInfoDao.java

@@ -45,4 +45,6 @@ public interface SarBussStandAttrInfoDao extends BaseMapper<SarBussStandAttrInfo
     Map<String, Object> selectStandFieldAndData(@Param("fieldInfo") String fieldInfo, @Param("standId") String standId);
 
 
+    void updateFSQR(@Param("id") String id,@Param("time") String time);
+
 }

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandAttrInfo/SarBussStandAttrInfoMapper.xml

@@ -161,4 +161,11 @@
         FROM SAR_BUSS_STAND_ATTR_INFO
         WHERE stand_id = #{standId} and valid_flag=0
     </select>
+
+    <update id="updateFSQR">
+        update SAR_BUSS_STAND_ATTR_INFO set FSRQBUSS = #{time}
+        where id = #{id}
+    </update>
+
+
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml

@@ -393,20 +393,20 @@
             parameterType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand">
         SELECT
             <include refid="Base_Column_List"/>,
-            DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH) AS reviewTime
+            DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH) AS reviewTime
         FROM sar_bussioness_stand
         WHERE stand_sort = 'Q/QCBFC'
         AND ISSUE_TIME IS NOT NULL
-        AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d')
+        AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d')
         BETWEEN DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_ADD(DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d'),INTERVAL 1 DAY)
         UNION
         SELECT
             <include refid="Base_Column_List"/>,
-            DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH) AS reviewTime
+            DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH) AS reviewTime
         FROM sar_bussioness_stand
         WHERE stand_sort != 'Q/QCBFC'
         AND ISSUE_TIME IS NOT NULL
-        AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 3 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d')
+        AND DATE_FORMAT(DATE_SUB(DATE_ADD(ISSUE_TIME, INTERVAL 5 YEAR),INTERVAL 1 MONTH),'%Y-%m-%d')
         BETWEEN DATE_FORMAT(#{issueTimeStart}, '%Y-%m-%d') AND DATE_ADD(DATE_FORMAT(#{issueTimeEnd}, '%Y-%m-%d'),INTERVAL 1 DAY)
     </select>