diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 047bfa43..b12e5a5c 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/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)); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 3270c493..2b43e214 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -70,6 +70,20 @@ public class SarBussionessStandController extends BaseController getStandInfoByReviseStatus(String reviseStatus) { + SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus); + return Result.success(result); + } + @ApiOperation(value = "|SarBussionessStandEO|删除") @PostMapping("deleteSarBussionessStand") //401问题2021-03-31暂时注释掉 liuhuiwen diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 0b7d0854..6129a753 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/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 getStandInfoByReviseStatus(String reviseStatus); + SarBussionessStand selectByPrimaryKey(String standId); List selectStandardsByStandNumber(SarBussionessStand sarBussionessStand); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java index 3f411919..7b663965 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java +++ b/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; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 39fa8d65..efd61892 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/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 getStandInfoByReviseStatus(String reviseStatus); + void attrInfoDetails (SarBussionessStand row) throws Exception; ResponseMessage deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index c68dc1d7..9c2998f9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -145,6 +145,11 @@ public class SarBussionessStandServiceImpl extends ServiceImpl deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception { SarBussionessStand sarStandardsInfoEO = new SarBussionessStand(); sarStandardsInfoEO.setValidFlag(1); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index 49d60d62..a6f35511 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -220,34 +220,34 @@ left join sar_bussioness_stand on sar_bussioness_stand.ID = es_revise_plan.rqb_json - and es_name like concat('%',#{esName},'%') + and es_revise_plan.es_name like concat('%',#{esName},'%') - and area = #{area} + and es_revise_plan.area = #{area} - and plan_status in + and es_revise_plan.plan_status in #{item} - and revise_status = #{reviseStatus} + and es_revise_plan.revise_status = #{reviseStatus} - and drafter = #{drafter} + and es_revise_plan.drafter = #{drafter} - and res_person = #{resPerson} + and es_revise_plan.res_person = #{resPerson} - and wg_leader = #{wgLeader} + and es_revise_plan.wg_leader = #{wgLeader} - 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') - 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') and (select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) like concat('%',#{unit},'%') diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 982af830..bc5ebed9 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -170,6 +170,8 @@ stand_sort, stand_year, stand_number, + REVISE_STATUS, + STAND_SN, #{modifyTime, jdbcType=TIMESTAMP}, @@ -190,6 +192,8 @@ #{standSort, jdbcType=VARCHAR}, #{standYear, jdbcType=VARCHAR}, #{standNumber, jdbcType=VARCHAR}, + #{reviseStatus, jdbcType=VARCHAR}, + #{standSn, jdbcType=VARCHAR}, @@ -322,6 +326,12 @@ + + delete from SAR_BUSSIONESS_STAND