FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2022-01-18 22:54:20 +08:00
parent 06c14bd8cd d18185e0b7
commit fac8ad54bf
7 changed files with 101 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
+3 -1
View File
@@ -122,5 +122,7 @@ public class EsRevisePlan extends BasePage {
@TableField(exist = false)
private List<String> planStatusList;
@ApiModelProperty(value = "立项单")
@TableField("LXD")
private String lxd;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarVppsTree/service/impl/SarVppsTreeServiceImpl.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class SarVppsTreeServiceImpl extends ServiceImpl<SarVppsTreeDao, SarVppsT
if(parent.getLevel()!=0){
sarMenuQueryWrapper.like("VPPS_CODE",parent.getId());
sarMenuQueryWrapper.likeRight("VPPS_CODE",parent.getId());
}
List<SarVppsTree> children=this.baseMapper.selectList(sarMenuQueryWrapper);
adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
+14
View File
@@ -75,6 +75,7 @@
<result property="useLevel" column="use_level"/>
<result property="technologic" column="technologic"/>
<result property="bussSort" column="buss_sort"/>
<result property="lxd" column="LXD"/>
</resultMap>
<!-- 查询条件-->
<sql id="Conditions">
@@ -140,6 +141,7 @@
es_revise_plan.use_level,
es_revise_plan.technologic,
es_revise_plan.buss_sort,
es_revise_plan.LXD,
sar_bussioness_stand.STAND_CODE as rqbName,
sar_bussioness_stand.STAND_SORT as standType,
(select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName,
@@ -208,6 +210,7 @@
es_revise_plan.use_level,
es_revise_plan.technologic,
es_revise_plan.buss_sort,
es_revise_plan.LXD,
sar_bussioness_stand.STAND_CODE as rqbName,
sar_bussioness_stand.STAND_SORT as standType,
sar_bussioness_stand.stand_number as standNum,
@@ -280,6 +283,7 @@
es_revise_plan.use_level,
es_revise_plan.technologic,
es_revise_plan.buss_sort,
es_revise_plan.LXD,
sar_bussioness_stand.STAND_CODE as rqbName,
sar_bussioness_stand.STAND_SORT as standType,
(select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName,
@@ -354,6 +358,9 @@
<if test="bussSort != null and bussSort != ''">
buss_sort=#{bussSort},
</if>
<if test="lxd != null and lxd != ''">
LXD=#{lxd},
</if>
</set>
where id = #{id}
</update>
@@ -418,6 +425,9 @@
<if test="bussSort != null and bussSort != ''">
buss_sort,
</if>
<if test="lxd != null and lxd != ''">
LXD,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -478,6 +488,9 @@
<if test="bussSort != null and bussSort != ''">
#{bussSort},
</if>
<if test="lxd != null and lxd != ''">
#{lxd},
</if>
</trim>
</insert>
<!-- 删除-->
@@ -513,6 +526,7 @@
es_revise_plan.use_level,
es_revise_plan.technologic,
es_revise_plan.buss_sort,
es_revise_plan.LXD,
sar_bussioness_stand.STAND_CODE as rqbName,
sar_bussioness_stand.STAND_SORT as standType,
(select group_concat(ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit)) as unitName,