feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多 改为测

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsPlanController.java

@@ -33,8 +33,7 @@ public class ActSarItemsPlanController {
     @PostMapping("/processCreatePlan")
     public ResponseMessage processCreatePlan(String infoJson) throws Exception {
         if (StringUtils.isNotBlank(infoJson)) {
-            actSarItemsEOService.processCreatePlan(infoJson);
+            return Result.success("200","入库成功",actSarItemsEOService.processCreatePlan(infoJson));
-            return Result.success("入库成功");
         } else {
             return Result.error("传入数据json不能为空");
         }

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

@@ -11,6 +11,7 @@ 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.entity.EsRevisePlan;
 import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
 import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
@@ -88,6 +89,9 @@ public class ActSarItemsBussEOService {
     @Autowired
     IEsRevisePlanService iEsRevisePlanService;
 
+    @Autowired
+    private EsRevisePlanDao esRevisePlanDao;
+
     @Autowired
     private ISarBussionessStandStateService bussionessStandStateService;
 
@@ -181,10 +185,10 @@ public class ActSarItemsBussEOService {
                 esRevisePlanDTO.setRqbName(DTQBBHBUSS);
                 esRevisePlanDTO.setLxd(LXD);
 
-                QueryWrapper qw = new QueryWrapper();
+                EsRevisePlan qw = new EsRevisePlan();
-                qw.eq("es_name",standName);
+                qw.setEsName(standName);
-                qw.eq("buss_sort",standSort);
+                qw.setBussSort(standSort);
-                List<EsRevisePlan> list = iEsRevisePlanService.list(qw);
+                List<EsRevisePlan> list = esRevisePlanDao.selectPageByName(qw);
                 if(!list.isEmpty()){
                     esRevisePlanDTO.setId(list.get(0).getId());
                     iEsRevisePlanService.updateById(esRevisePlanDTO);

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

@@ -1,7 +1,9 @@
 package com.adc.da.workFlow.service;
 
+import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao;
 import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
 import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
+import com.adc.da.util.UUIDUtils;
 import com.adc.da.workFlow.dao.ActSarItemsEODao;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -28,13 +30,17 @@ public class ActSarItemsPlanService {
     @Autowired
     private IEsRevisePlanService iEsRevisePlanService;
 
+    @Autowired
+    private EsRevisePlanDao esRevisePlanDao;
+
 
     @Value("${elas.flag}")
     private boolean elasflag;
 
-    public void processCreatePlan(String standJson) throws Exception{
+    public String processCreatePlan(String standJson) throws Exception{
         JSONObject object = new JSONObject();
         object = JSONObject.parseObject(standJson);
+        String id = "";
         if (object != null && !object.isEmpty()) {
             Map<String,String>  plan_status=new HashMap<>();
             plan_status.put("未开始","0");
@@ -59,20 +65,26 @@ public class ActSarItemsPlanService {
             esRevisePlanDTO.setReleaseTime(object.getDate("planTime"));
             esRevisePlanDTO.setBussSort(object.getString("bussSort"));
             if(StringUtils.isNotBlank(object.getString("esName")) && StringUtils.isNotBlank(object.getString("bussSort"))){
-                QueryWrapper qw = new QueryWrapper();
+                EsRevisePlan qw = new EsRevisePlan();
-                qw.eq("es_name",object.getString("esName"));
+                qw.setEsName(object.getString("esName"));
-                qw.eq("buss_sort",object.getString("bussSort"));
+                qw.setBussSort(object.getString("bussSort"));
-                List<EsRevisePlan> list = iEsRevisePlanService.list(qw);
+                List<EsRevisePlan> list = esRevisePlanDao.selectPageByName(qw);
                 if(!list.isEmpty()){
+                    id = list.get(0).getId();
                     esRevisePlanDTO.setId(list.get(0).getId());
                     iEsRevisePlanService.updateById(esRevisePlanDTO);
                 }else{
-                    iEsRevisePlanService.addPlan(esRevisePlanDTO);
+                    id = UUIDUtils.randomUUID(32);
+                    esRevisePlanDTO.setId(id);
+                    esRevisePlanDao.insertOne(esRevisePlanDTO);
                 }
             }else {
-                iEsRevisePlanService.addPlan(esRevisePlanDTO);
+                id = UUIDUtils.randomUUID(32);
+                esRevisePlanDTO.setId(id);
+                esRevisePlanDao.insertOne(esRevisePlanDTO);
             }
         }
+        return id;
     }
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java

@@ -81,6 +81,12 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
         return Result.success(iEsRevisePlanService.modPlanByState(esRevisePlan));
     }
 
+    @ApiOperation(value = "编辑企标计划-流程")
+    @PostMapping("modPlanByProcess")
+    public ResponseMessage<Object> modPlanByProcess(@RequestBody EsRevisePlan esRevisePlan){
+        return Result.success(iEsRevisePlanService.modPlanByProcess(esRevisePlan));
+    }
+
     @ApiOperation(value = "编辑企标计划")
     @PostMapping("/modPlanByWk")
     public ResponseMessage<Object> modPlanByWk(@RequestBody EsRevisePlan esRevisePlan){

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java

@@ -3,6 +3,7 @@ package com.adc.da.slrs.esRevisePlan.dao;
 import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -14,6 +15,7 @@ import java.util.List;
  * @author zcr
  * @since 2021-11-14
  */
+@Repository
 public interface EsRevisePlanDao extends BaseMapper<EsRevisePlan> {
     Integer getTotal();
     Integer getQueryTotal(EsRevisePlan esRevisePlan);

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

@@ -125,4 +125,10 @@ public class EsRevisePlan extends BasePage {
     @ApiModelProperty(value = "立项单")
     @TableField("LXD")
     private String lxd;
+
+    @TableField(exist = false)
+    private String standCode;
+
+    @TableField(exist = false)
+    private String processType;
 }

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

@@ -20,6 +20,7 @@ public interface IEsRevisePlanService extends IService<EsRevisePlan> {
 
     String modPlan(EsRevisePlan esRevisePlan);//编辑
     String modPlanByState(EsRevisePlan esRevisePlan);//编辑
+    String modPlanByProcess(EsRevisePlan esRevisePlan);//编辑
     String addPlan(EsRevisePlan esRevisePlan);//插入
     int delPlan(String id);//删除
     int delPlans(String ids);//批量删除

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

@@ -7,6 +7,8 @@ import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao;
 import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
 import com.adc.da.slrs.esStandRelation.entity.EsStandRelation;
 import com.adc.da.slrs.esStandRelation.service.IEsStandRelationService;
+import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
+import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -38,6 +41,8 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
     IEsMatingRelationService esMatingRelationService;
     @Autowired
     IEsStandRelationService esStandRelationService;
+    @Autowired
+    private ISarBussionessStandService iSarBussionessStandService;
 
     @Override
     public List<EsRevisePlan> getAllPlans(EsRevisePlan esRevisePlan) {
@@ -76,11 +81,53 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
     }
 
     @Override
-    public String modPlanByState(EsRevisePlan esRevisePlan) {
+    public String modPlanByProcess(EsRevisePlan esRevisePlan) {
         esRevisePlanDao.updateById(esRevisePlan);
         return "操作成功";
     }
 
+    @Override
+    public String modPlanByState(EsRevisePlan esRevisePlan) {
+        // 更新 企标库 制修订状态
+        if(StringUtils.isNotBlank(esRevisePlan.getStandCode())){
+            List<String> list= Arrays.stream(esRevisePlan.getStandCode().split(",")).map(String::trim).collect(Collectors.toList());
+            if(!list.isEmpty()){
+                QueryWrapper qw = new QueryWrapper();
+                qw.in("STAND_CODE",list);
+                List<SarBussionessStand> standList = iSarBussionessStandService.list(qw);
+                standList.forEach(stand -> {
+                    if(StringUtils.isBlank(esRevisePlan.getPlanStatus()) || !"4".equals(esRevisePlan.getPlanStatus())){
+                        if("1".equals(esRevisePlan.getReviseStatus())){
+                            stand.setRevisionStatus(esRevisePlan.getProcessType()+"_"+"1");
+                        }else if("2".equals(esRevisePlan.getReviseStatus())){
+                            stand.setRevisionStatus(esRevisePlan.getProcessType()+"_"+"2");
+                        }else if("3".equals(esRevisePlan.getReviseStatus())){
+                            stand.setRevisionStatus(esRevisePlan.getProcessType()+"_"+"3");
+                        }
+                    }else{
+                        stand.setRevisionStatus(esRevisePlan.getProcessType()+"_"+"4");
+                    }
+                });
+                iSarBussionessStandService.updateBatchById(standList);
+            }
+        }
+
+        // 技术标准 更新计划库
+        if(StringUtils.isNotBlank(esRevisePlan.getId())){
+            if(StringUtils.isBlank(esRevisePlan.getPlanStatus()) || !"4".equals(esRevisePlan.getPlanStatus())){
+                if("1".equals(esRevisePlan.getReviseStatus())){
+                    esRevisePlan.setPlanStatus("1");
+                }else if("2".equals(esRevisePlan.getReviseStatus())){
+                    esRevisePlan.setPlanStatus("2");
+                }else if("3".equals(esRevisePlan.getReviseStatus())){
+                    esRevisePlan.setPlanStatus("3");
+                }
+            }
+            esRevisePlanDao.updateById(esRevisePlan);
+        }
+        return "操作成功";
+    }
+
     @Override
     public String addPlan(EsRevisePlan esRevisePlan) {
         esRevisePlan.setId(UUIDUtils.randomUUID(32));

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java

@@ -115,6 +115,11 @@ public class SarBussionessStand extends BaseEntity {
     @TableField("REVISE_STATUS")
     private String reviseStatus;
 
+    @ApiModelProperty(value = "制修订状态 buss1_1 技术标准 制定中 buss1_2 技术标准 修订中 " +
+            ", buss2_1 产品标准_制定中 buss2_2 产品标准_修订中 buss2_3 产品标准_修改中")
+    @TableField("REVISION_STATUS")
+    private String revisionStatus;
+
     @ApiModelProperty(value = "标准顺序号")
     @TableField("STAND_SN")
     private String standSn;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStandExport.java

@@ -111,6 +111,11 @@ public class SarBussionessStandExport extends BaseEntity {
     @TableField("REVISE_STATUS")
     private String reviseStatus;
 
+    @ApiModelProperty(value = "制修订状态 buss1_1 技术标准 制定中 buss1_2 技术标准 修订中 " +
+            ", buss2_1 产品标准_制定中 buss2_2 产品标准_修订中 buss2_3 产品标准_修改中")
+    @TableField("REVISION_STATUS")
+    private String revisionStatus;
+
     @ApiModelProperty(value = "标准顺序号")
     @TableField("STAND_SN")
     private String standSn;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java

@@ -18,6 +18,8 @@ public class SarBussionessStandEOPage extends BasePage {
 
     private String reviseStatus;
 
+    private String revisionStatus;
+
     public String getTextStatusBuss() {
         return textStatusBuss;
     }

adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java

@@ -107,7 +107,7 @@ public class BussStandExportUtil {
                 value = verifyBean(sarStandardsInfoEO.getStandStatusShow());
                 break;
             case "企标制修订状态":
-                value = verifyBean(sarStandardsInfoEO.getReviseStatus());
+                value = verifyBean(sarStandardsInfoEO.getRevisionStatus());
                 break;
             case "企标实施日期":
                 String putTime="";
@@ -165,22 +165,27 @@ public class BussStandExportUtil {
         if(StringUtils.isNotBlank(value)){
             if(value.contains("buss1_")){
                 if("buss1_1".equals(value)){
-                    val = "制定";
+                    val = "技术标准-制定中";
                 }else if("buss1_2".equals(value)){
-                    val = "修订";
+                    val = "技术标准-修订中";
+                }else if("buss1_4".equals(value)){
+                    val = "技术标准-已完成";
                 }else {
                     val = "";
                 }
             }else if(value.contains("buss2_")){
                 switch (value) {
                     case "buss2_1":
-                        val = "制定";
+                        val = "产品标准-制定中";
                         break;
                     case "buss2_2":
-                        val = "修订";
+                        val = "产品标准-修订中";
                         break;
                     case "buss2_3":
-                        val = "修改";
+                        val = "产品标准-修改中";
+                        break;
+                    case "buss2_4":
+                        val = "产品标准-已完成";
                         break;
                     default:
                         val = "";

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

@@ -52,7 +52,8 @@
      SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag,
      SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,SAR_BUSSIONESS_STAND.stand_sort,SAR_BUSSIONESS_STAND.stand_year,
      stand_status, replaced_stand_num,replace_stand_num,put_time,issue_time,stand_en_name,
-     stand_name, stand_code,SAR_BUSSIONESS_STAND.id,SAR_BUSSIONESS_STAND.text_status_buss,SAR_BUSSIONESS_STAND.stand_number,SAR_BUSSIONESS_STAND.revise_status
+     stand_name, stand_code,SAR_BUSSIONESS_STAND.id,SAR_BUSSIONESS_STAND.text_status_buss,SAR_BUSSIONESS_STAND.stand_number,SAR_BUSSIONESS_STAND.revise_status,
+     SAR_BUSSIONESS_STAND.REVISION_STATUS
   </sql>
 
     <sql id="Base_Column_List_show_Export" >
@@ -61,7 +62,8 @@
      SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,SAR_BUSSIONESS_STAND.stand_sort,SAR_BUSSIONESS_STAND.stand_year,
      stand_status, replaced_stand_num,replace_stand_num,put_time,issue_time,stand_en_name,
      stand_name, stand_code,SAR_BUSSIONESS_STAND.text_status_buss,SAR_BUSSIONESS_STAND.stand_number,
-     dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,SAR_BUSSIONESS_STAND.revise_status
+     dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow,SAR_BUSSIONESS_STAND.revise_status,
+     SAR_BUSSIONESS_STAND.REVISION_STATUS
   </sql>
 
     <sql id="Base_Column_List_show_ExportResult" >
@@ -70,12 +72,12 @@
      tmp_tb.apply_country, tmp_tb.stand_nature,tmp_tb.stand_sort,tmp_tb.stand_year,
      tmp_tb.stand_status, tmp_tb.replaced_stand_num,tmp_tb.replace_stand_num,tmp_tb.put_time,tmp_tb.issue_time,tmp_tb.stand_en_name,
      tmp_tb.stand_name, tmp_tb.stand_code,tmp_tb.text_status_buss,tmp_tb.stand_number,
-     tmp_tb.standStatusShow,tmp_tb.revise_status
+     tmp_tb.standStatusShow,tmp_tb.revise_status,tmp_tb.REVISION_STATUS
   </sql>
 
     <sql id="Group_Column_List_show" >
      stand_status, replaced_stand_num, replace_stand_num,put_time,
-     issue_time, stand_en_name, stand_name, stand_code,stand_status,revise_status,
+     issue_time, stand_en_name, stand_name, stand_code,stand_status,revise_status,REVISION_STATUS,
      SAR_BUSSIONESS_STAND.id, SAR_BUSS_STAND_ATTR_INFO.DTQBBHBUSS
   </sql>
 
@@ -491,6 +493,10 @@
                 and revise_status=#{reviseStatus}
             </if>
 
+            <if test="revisionStatus !=null and revisionStatus != ''">
+                and REVISION_STATUS=#{revisionStatus}
+            </if>
+
             <if test='syncParam != null and syncParam == "sync"'>
                 and SAR_BUSSIONESS_STAND.MODIFY_TIME between DATE_SUB(NOW(),INTERVAL 7 day) and DATE_SUB(NOW(),INTERVAL -1 day)
             </if>