dengyj 3 vuotta sitten
vanhempi
commit
65f6fdeae9

+ 2 - 1
src/main/java/com/steerinfo/SysManageApplication.java

@@ -71,7 +71,8 @@ public class SysManageApplication implements WebMvcConfigurer {
         FastJsonConfig fastJsonConfig = new FastJsonConfig();
         // 3.添加配置
         fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");                       // 自定义时间格式
-        fastJsonConfig.setSerializerFeatures(SerializerFeature.WriteMapNullValue); // 正常转换 null 值
+        fastJsonConfig.setSerializerFeatures(SerializerFeature.WriteMapNullValue
+                ,SerializerFeature.WriteNullStringAsEmpty); // 正常转换 null 值
         SerializeConfig serializeConfig = SerializeConfig.getGlobalInstance();
         serializeConfig.put(Float.TYPE, ToStringSerializer.instance);
         serializeConfig.put(Float.class, ToStringSerializer.instance);

+ 13 - 1
src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -7191,11 +7191,23 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         rm.setFailed();
         try {
             if(!CollectionUtils.isEmpty(models)){
+                int lcCount = 0;
+                for (MeterWorkRailwayActFirst model : models) {
+                    MeterWorkRailwayActFirst actFirst = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirstNo());
+                    if(actFirst != null && StringUtils.isNotEmpty(actFirst.getLcNo())) {
+                        lcCount ++;
+                    }
+                }
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
                 String afl = sdf.format(new Date());
                 String lcNo = meterWorkRailwayActFirstMapper.getLcNo(afl, models.get(0).getBaseSpotNo());
                 int count = 0;
+
                 for (MeterWorkRailwayActFirst model : models) {
+                    MeterWorkRailwayActFirst actFirst = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirstNo());
+                    if(actFirst != null && StringUtils.isNotEmpty(actFirst.getLcNo())) {
+                        continue;
+                    }
                     MeterBaseOperationLog logModel = new MeterBaseOperationLog();
                     logModel.setId(PublicMethod.IdCreate(2));
                     logModel.setCreateManNo(model.getCreateManNo());
@@ -7211,7 +7223,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     model.setLcNo(model.getBaseSpotName().replaceAll("#", "")
                             .replaceAll("轨道衡", "")
                             .replaceAll("静轨", "")
-                            .replaceAll("静态", "") + "-" + afl + lcNo + "(" + models.size() + ")");
+                            .replaceAll("静态", "") + "-" + afl + lcNo + "(" + lcCount + ")");
                     meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
                     MeterWorkRailwayActual actualModel = meterWorkRailwayActualMapper.selectActual(model.getActualFirstNo());
                     if(actualModel != null) {

+ 4 - 3
src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/mapper/MeterWorkRailwayActualMapper.xml

@@ -3995,9 +3995,10 @@
   </select>
 
   <select id="selectActual" parameterType="java.lang.String" resultMap="BaseResultMap">
-    SELECT *
-    from METER_WORK_RAILWAY_ACTUAL
-    where ACTUAL_FIRST1_NO = #{actualFirstNo} or ACTUAL_FIRST2_NO = #{actualFirstNo}
+    <include refid="select" />
+    where (ACTUAL_FIRST1_NO = #{actualFirstNo} or ACTUAL_FIRST2_NO = #{actualFirstNo})
+        and rownum = 1
+    order by actual_no desc
   </select>
 
   <select id="selectByParameter" parameterType="java.util.HashMap" resultMap="BaseResultMap">