后端提交

src/main/java/com/steerinfo/baseinfo/appversionmsg/controller/AppVersionMsgController.java

@@ -5,6 +5,7 @@ import com.steerinfo.baseinfo.appversionmsg.service.IAppVersionMsgService;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -65,6 +67,13 @@ public class AppVersionMsgController extends BaseRESTfulController {
     //@RequiresPermissions("appversionmsg:create")
     @PostMapping(value = "/")
     public RESTfulResult add(@ModelAttribute AppVersionMsg model){
+        UserPayload payload = UserPayload.getCurrUser();
+        model.setCreateId(payload.getUserCode());
+        model.setCreateName(payload.getUserName());
+        model.setCreateTime(new Date());
+        model.setPublishUserId(payload.getUserCode());
+        model.setPublishUserName(payload.getUserName());
+        model.setPublishDate(new Date());
         AppVersionMsg appVersionMsg = appVersionMsgService.add(model);
         return success(appVersionMsg);
     }
@@ -87,6 +96,10 @@ public class AppVersionMsgController extends BaseRESTfulController {
     @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
     public RESTfulResult update(@PathVariable String id, @RequestBody AppVersionMsg model){
         model.setId(id);
+        UserPayload payload = UserPayload.getCurrUser();
+        model.setUpdateId(payload.getUserCode());
+        model.setUpdateName(payload.getUserName());
+        model.setUpdateTime(new Date());
         AppVersionMsg appVersionMsg = appVersionMsgService.modify(model);
         return success(appVersionMsg);
     }

src/main/java/com/steerinfo/baseinfo/meterbaserailwaycarriageweight/controller/MeterBaseRailwayCarriageWeightController.java

@@ -67,7 +67,6 @@ public class MeterBaseRailwayCarriageWeightController extends BaseRESTfulControl
     @PostMapping(value = "/")
     public RESTfulResult add(@RequestBody MeterBaseRailwayCarriageWeight model){
         //判断code是否唯一
-
         if (meterBaseRailwayCarriageWeightService.getByProperty("carriageCode",model.getCarriageCode()) != null){
             return failed(null,"存在相同Code");
         }

src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/impl/MeterWorkMonitorServiceImpl.java

@@ -94,7 +94,7 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
             if(Objects.nonNull(model.getPointNo()) && StringUtils.isNotEmpty(model.getPointNo())) {
                 tempModel = meterWorkMonitorMapper.selectByPrimaryKey(model.getPointNo());
             }
-            Assert.isTrue(Objects.nonNull(tempModel), "未查询到秤点信息");
+            Assert.isTrue(Objects.nonNull(tempModel.getPointNo()), "未查询到秤点信息");
             tempModel.setLastTime(new Date());
             meterWorkMonitorMapper.updateByPrimaryKeySelective(tempModel);
             return tempModel.getPointNo();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.xml

@@ -2641,7 +2641,7 @@
            t.METER_WEIGHT, t.WEIGHT_TYPE, t.METER_SORT_WEIGHT, t.METER_BALANCE_WEIGHT, t.CREATE_MAN_NO,
            t.CREATE_MAN_NAME, t.CREATE_TIME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.METER_CLASS,t.data_source,
            t.METER_GROUP, t.VALUE_FLAG, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME,
-           t.CHECK_FLAG, t.CHECK_MAN_NO, t.CHECK_MAN_NAME, t.CHECK_TIME, t.METER_MODE, t.RAILWAY_TYPE_NO,
+           t.CHECK_FLAG, t.CHECK_MAN_NO, t.CHECK_MAN_NAME, t.CHECK_TIME, t.METER_MODE, t.RAILWAY_TYPE_NO, t.lc_no,
            t.RAILWAY_TYPE_NAME, T1.ARRIVAL, T1.STATION, T1.MEMO,T1.SOURCE_AREA
     from METER_WORK_RAILWAY_ACT_FIRST t,PRE_RAILWAY_SCALE t1
     where t.ACTUAL_FIRST_NO= #{actualFirstNo,jdbcType=VARCHAR} and t1.PREDICTION_NO= #{predictionNo,jdbcType=VARCHAR}
@@ -2652,7 +2652,7 @@
             WEIGHT_TYPE, METER_SORT_WEIGHT, METER_BALANCE_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME,
             CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG,
             UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME,
-            CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME,METER_TYPE_NO,METER_TYPE_NAME
+            CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME,METER_TYPE_NO,METER_TYPE_NAME, lc_no
     from METER_WORK_RAILWAY_ACT_FIRST
     where ACTUAL_FIRST_NO= #{actualFirstNo,jdbcType=VARCHAR}
   </select>
@@ -3462,11 +3462,17 @@
         and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
       </if>
       <if test="lcNoTemp != null and lcNoTemp != ''">
-        and lc_no in
+        and ( lc_no in
         <foreach collection="lcNoTemp" item="item" open="(" separator="," close=")">
           #{item}
         </foreach>
       </if>
+      <if test="lcNoNull != null and lcNoNull != ''">
+        or lc_no is null )
+      </if>
+      <if test="lcNoNull == null or lcNoNull == ''">
+        and lc_no is not null)
+      </if>
       <!--静轨组列次号需要-->
       <if test="flag != null and flag != ''">
         and value_flag in ('1','2')
@@ -3493,10 +3499,16 @@
     <if test="railwayTypeNo != null and railwayTypeNo != ''">
       and  RAILWAY_TYPE_NO = #{railwayTypeNo}
     </if>
-    and lc_no in
+    and ( lc_no in
     <foreach collection="lcNoTemp" item="item" open="(" separator="," close=")">
       #{item}
     </foreach>
+    <if test="lcNoNull != null and lcNoNull != ''">
+      or lc_no is null )
+    </if>
+    <if test="lcNoNull == null or lcNoNull == ''">
+       and lc_no is not null)
+    </if>
 <!--    <if test="lcNo != null and lcNo != ''">-->
 <!--      and lc_No in (#{lcNo})-->
 <!--    </if>-->

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -363,7 +363,11 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             if (rows.size() >= 1) {
                 model.setValueFlag("1");
             } else {
-                model.setValueFlag("0");
+                if(model.getValueFlag().equals("0")) {
+                    model.setValueFlag("1");
+                }else{
+                    model.setValueFlag("0");
+                }
             }
             /*if(model.getWeightType().equals("0")) {
                 map.put("actualFirst1No", model.getActualFirstNo());
@@ -449,6 +453,15 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         String[] lcNoTemp = parameters.get("lcNoTemp").toString().split(",");
         parameters.remove("lcNoTemp");
         parameters.put("lcNoTemp", lcNoTemp);
+        for (String str:
+             lcNoTemp) {
+            if(str.equals("")) {
+                parameters.put("lcNoNull", "1");
+                break;
+            }else {
+                parameters.put("lcNoNull", "");
+            }
+        }
         List<MeterWorkRailwayActFirst> rows = meterWorkRailwayActFirstMapper.likeByDesc(parameters);
         return rows;
     }
@@ -483,6 +496,15 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         String[] lcNoTemp = param.get("lcNo").toString().split(",");
 //        param.remove("lcNo");
         param.put("lcNoTemp", lcNoTemp);
+        for (String str:
+                lcNoTemp) {
+            if(str.equals("")) {
+                param.put("lcNoNull", "1");
+                break;
+            }else {
+                param.put("lcNoNull", "");
+            }
+        }
         List<String> list = meterWorkRailwayActFirstMapper.distinctRailwayNo(param)
                 .stream()
                 .map(MeterWorkRailwayActFirst::getRailwayNo)

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/controller/MeterWorkRailwayActualController.java

@@ -96,6 +96,18 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "C#获取列表", notes = "不分页分页模糊查询")
+    @PostMapping(value = "/noPage")
+    public RESTfulResult noPage(@RequestBody HashMap parmas) {
+        try {
+            List<MeterWorkRailwayActual> list = meterWorkRailwayActualService.noPage(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "获取列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/IMeterWorkRailwayActualService.java

@@ -88,6 +88,7 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
     RESTfulResult specialRemove(HashMap map);
 
     PageList<MeterWorkRailwayActual> likeByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize);
+    List<MeterWorkRailwayActual> noPage(Map<String, Object> params);
 
     RESTfulResult batchUpdateLcNo(List<MeterWorkRailwayActual> models);
     RESTfulResult autoPrintRailway(HashMap<String, Object> map);

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -2061,6 +2061,12 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         return pageInfo;
     }
 
+    @Override
+    public List<MeterWorkRailwayActual> noPage(Map<String, Object> params) {
+        List<MeterWorkRailwayActual> rows = meterWorkRailwayActualMapper.likeByDesc(params);
+        return rows;
+    }
+
     @Override
     public RESTfulResult batchUpdateLcNo(List<MeterWorkRailwayActual> models) {
         RESTfulResult rm = new RESTfulResult();