指标字典调整

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml

@@ -3,9 +3,19 @@
 <mapper namespace="com.njcn.system.mapper.EleEpdPqdMapper">
 
     <select id="page" resultType="EleEpdPqdVO">
-        SELECT t0.*
-        FROM ele_epd_pqd t0
-        ${ew.sqlSegment}
+        SELECT
+            sdd.Name dataTypeName,
+            ele_epd_pqd.*
+        FROM
+            ele_epd_pqd ele_epd_pqd
+        left join
+            sys_dict_data sdd
+        on
+            ele_epd_pqd.data_type = sdd.Id
+        <where>
+            1=1
+            and ${ew.sqlSegment}
+        </where>
     </select>
 
 </mapper>

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java

@@ -43,6 +43,7 @@ public class EleEpdPqdServiceImpl extends MppServiceImpl<EleEpdPqdMapper, EleEpd
             if (StringUtils.isBlank(item.getType())){
                 eleEpdPqd.setType("");
             }
+            eleEpdPqd.setStatus(1);
             return eleEpdPqd;
         }).collect(Collectors.toList());
         this.saveBatch(list,1000);
@@ -53,12 +54,15 @@ public class EleEpdPqdServiceImpl extends MppServiceImpl<EleEpdPqdMapper, EleEpd
         checkEleEpdPqdParam(eleEpdPqdParam,false);
         EleEpdPqd eleEpdPqd = new EleEpdPqd();
         BeanUtils.copyProperties(eleEpdPqdParam,eleEpdPqd);
+        eleEpdPqd.setStatus(1);
         this.save(eleEpdPqd);
     }
 
     @Override
     public void delete(String id) {
-        this.baseMapper.deleteById(id);
+        EleEpdPqd eleEpdPqd = this.lambdaQuery().eq(EleEpdPqd::getId,id).one();
+        eleEpdPqd.setStatus(0);
+        this.updateById(eleEpdPqd);
     }
 
     @Override
@@ -89,6 +93,10 @@ public class EleEpdPqdServiceImpl extends MppServiceImpl<EleEpdPqdMapper, EleEpd
                 queryWrapper.orderBy(true, true, "Sort");
             }
         }
+        if (!StringUtils.isBlank(queryParam.getDataType())){
+            queryWrapper.eq("ele_epd_pqd.data_type", queryParam.getDataType());
+        }
+        queryWrapper.eq("ele_epd_pqd.status", 1);
         return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
     }