Merge branch 'develop_master' into FOTON

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

@@ -408,6 +408,8 @@ public class ActSarItemsBussEOService {
             case "standName": sarBussionessStand.setStandName(valueStr); break;
             case "standEnName": sarBussionessStand.setStandEnName(valueStr); break;
             case "textStatusBuss": sarBussionessStand.setTextStatusBuss(valueStr); break;
+            case "reviseStatus": sarBussionessStand.setReviseStatus(valueStr); break;
+            case "standSn": sarBussionessStand.setStandSn(valueStr); break;
             case "issueTime":
                 if (StringUtils.isNotBlank(valueStr)) {
                     sarBussionessStand.setIssueTime(tTo(valueStr));

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java

@@ -70,6 +70,20 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
     @Autowired
     private IDicTypeEOService dicTypeEOService;
 
+    /**
+     * 根据计划库制定状态查询企标编号
+     *
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "|SarBussionessStandEO|根据计划库制定状态查询企标编号")
+    @GetMapping("/getStandInfoByReviseStatus")
+    //@RequiresPermissions("lawss:sarStandardsInfo:get")
+    public ResponseMessage<SarBussionessStand> getStandInfoByReviseStatus(String reviseStatus) {
+        SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus);
+        return Result.success(result);
+    }
+
     @ApiOperation(value = "|SarBussionessStandEO|删除")
     @PostMapping("deleteSarBussionessStand")
     //401问题2021-03-31暂时注释掉 liuhuiwen

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java

@@ -22,6 +22,8 @@ import java.util.List;
 @Repository
 public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
 
+    SarBussionessStand getStandInfoByReviseStatus(String reviseStatus);
+
     SarBussionessStand selectByPrimaryKey(String standId);
 
     List<SarBussionessStand> selectStandardsByStandNumber(SarBussionessStand sarBussionessStand);

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

@@ -111,8 +111,20 @@ public class SarBussionessStand extends BaseEntity {
     @TableField("TEXT_STATUS_BUSS")
     private String textStatusBuss;
 
+    @ApiModelProperty(value = "计划库制定状态 0 默认 1 制定 2修订")
+    @TableField("REVISE_STATUS")
+    private String reviseStatus;
+
+    @ApiModelProperty(value = "标准顺序号")
+    @TableField("STAND_SN")
+    private String standSn;
+
 
     // 非表字段
+    @TableField(exist = false)
+    private String newStandSn;
+
+
     @TableField(exist = false)
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private String firstPutTime;

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

@@ -18,6 +18,8 @@ import java.util.List;
  */
 public interface ISarBussionessStandService extends IService<SarBussionessStand> {
 
+    SarBussionessStand getStandInfoByReviseStatus(String reviseStatus);
+
     void attrInfoDetails (SarBussionessStand row) throws Exception;
 
     ResponseMessage<SarBussionessStand> deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception;

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

@@ -145,6 +145,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     @Autowired
     private StandLawsSearchService standLawsSearchService;
 
+    @Override
+    public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus){
+        return sarBussionessStandEODao.getStandInfoByReviseStatus(reviseStatus);
+    }
+
     public ResponseMessage<SarBussionessStand> deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception {
         SarBussionessStand sarStandardsInfoEO = new SarBussionessStand();
         sarStandardsInfoEO.setValidFlag(1);

adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml

@@ -221,34 +221,34 @@
         left join sar_bussioness_stand on sar_bussioness_stand.ID = es_revise_plan.rqb_json
         <where>
             <if test="esName != null and esName != ''">
-                and es_name like concat('%',#{esName},'%')
+                and es_revise_plan.es_name like concat('%',#{esName},'%')
             </if>
             <if test="area != null and area != ''">
-                and area = #{area}
+                and es_revise_plan.area = #{area}
             </if>
             <if test="planStatusList != null">
-                and plan_status in
+                and es_revise_plan.plan_status in
                 <foreach collection="planStatusList" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
             <if test="reviseStatus != null and reviseStatus != ''">
-                and revise_status = #{reviseStatus}
+                and es_revise_plan.revise_status = #{reviseStatus}
             </if>
             <if test="drafter != null and drafter != ''">
-                and drafter = #{drafter}
+                and es_revise_plan.drafter = #{drafter}
             </if>
             <if test="resPerson != null and resPerson != ''">
-                and res_person = #{resPerson}
+                and es_revise_plan.res_person = #{resPerson}
             </if>
             <if test="wgLeader != null and wgLeader != ''">
-                and wg_leader = #{wgLeader}
+                and es_revise_plan.wg_leader = #{wgLeader}
             </if>
             <if test="draftTime != null">
-                and DATE_FORMAT(draft_time,'%Y-%m-%d')=DATE_FORMAT(#{draftTime},'%Y-%m-%d')
+                and DATE_FORMAT(es_revise_plan.draft_time,'%Y-%m-%d')=DATE_FORMAT(#{draftTime},'%Y-%m-%d')
             </if>
             <if test="releaseTime != null">
-                and DATE_FORMAT(release_time,'%Y-%m-%d')=DATE_FORMAT(#{releaseTime},'%Y-%m-%d')
+                and DATE_FORMAT(es_revise_plan.release_time,'%Y-%m-%d')=DATE_FORMAT(#{releaseTime},'%Y-%m-%d')
             </if>
             <if test="unit != null and unit != ''">
                 and (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) like concat('%',#{unit},'%')

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

@@ -170,6 +170,8 @@
             <if test="standSort != null" >stand_sort,</if>
             <if test="standYear != null" >stand_year,</if>
             <if test="standNumber != null" >stand_number,</if>
+            <if test="reviseStatus != null" >REVISE_STATUS,</if>
+            <if test="standSn != null" >STAND_SN,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
             <if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
@@ -190,6 +192,8 @@
             <if test="standSort != null" >#{standSort, jdbcType=VARCHAR},</if>
             <if test="standYear != null" >#{standYear, jdbcType=VARCHAR},</if>
             <if test="standNumber != null" >#{standNumber, jdbcType=VARCHAR},</if>
+            <if test="reviseStatus != null" >#{reviseStatus, jdbcType=VARCHAR},</if>
+            <if test="standSn != null" >#{standSn, jdbcType=VARCHAR},</if>
         </trim>
     </insert>
 
@@ -322,6 +326,12 @@
 
     </select>
 
+    <select id="getStandInfoByReviseStatus" resultMap="BaseResultMap" parameterType="java.lang.String">
+        select LPAD(MAX(DISTINCT CAST(STAND_SN AS decimal(9)))+1, 3, 0) AS newStandSn from sar_bussioness_stand
+        where revise_status = #{value} and valid_flag=0
+
+    </select>
+
     <!-- 删除记录 -->
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from SAR_BUSSIONESS_STAND