修改

src/main/java/com/steerinfo/baseinfo/combaseinfo/controller/ComBaseInfoController.java

@@ -288,4 +288,11 @@ public class ComBaseInfoController extends BaseRESTfulController {
         return success(models);
     }
 
+    @ApiOperation(value = "获取用户审核权限等级", notes="关键字:1：计量数据管理员、2：计量班长、3：计量员、4：没有权限")
+    @PostMapping(value = "/checkManLevel", produces = "application/json;charset=UTF-8")
+    public RESTfulResult checkManLevel(@RequestBody(required = false) HashMap<String, Object> params) {
+        String str = comBaseInfoService.checkManLevel(params);
+        return success(str);
+    }
+
 }

src/main/java/com/steerinfo/baseinfo/combaseinfo/service/IComBaseInfoService.java

@@ -49,4 +49,6 @@ public interface IComBaseInfoService extends IBaseService<ComBaseInfo, String>{
     String doUpdateWf(ComBaseInfo model);
 
     List<ComBaseInfo> measurementLeaderNo(HashMap<String, Object> params);
+
+    String checkManLevel(HashMap<String, Object> map);
 }

src/main/java/com/steerinfo/baseinfo/combaseinfo/service/impl/ComBaseInfoServiceImpl.java

@@ -6,7 +6,9 @@ import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.baseinfo.combaseinfo.model.ComBaseInfo;
 import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
 import com.steerinfo.baseinfo.combaseinfo.service.IComBaseInfoService;
+import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.meterwork.except.MarkerMetException;
+import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkstoragecalibration.model.MeterWorkStorageCalibration;
 import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -100,6 +102,48 @@ public class ComBaseInfoServiceImpl extends BaseServiceImpl<ComBaseInfo, String>
         return models;
     }
 
+    @Override
+    public String checkManLevel(HashMap<String, Object> map) {
+        UserPayload payload = UserPayload.getCurrUser();
+        String userId = payload.getUserCode();
+        String userName = payload.getUserName();
+        //计量数据管理员
+        HashMap<String, Object> meteringAdministratorMap = new HashMap<>();
+        meteringAdministratorMap.put("pBaseCode", "001058");
+        List<String> meteringAdministratorModels = comBaseInfoMapper.matterNoByBaseCode(meteringAdministratorMap);
+        //计量班长
+        HashMap<String, Object> gaugerMonitorMap = new HashMap<>();
+        gaugerMonitorMap.put("pBaseCode", "001057");
+        List<String> gaugerMonitorModels = comBaseInfoMapper.matterNoByBaseCode(gaugerMonitorMap);
+        //计量员
+        HashMap<String, Object> gaugerMap = new HashMap<>();
+        gaugerMap.put("pBaseCode", "001056");
+        List<String> gaugerModels = comBaseInfoMapper.matterNoByBaseCode(gaugerMap);
+
+        if(meteringAdministratorModels.size() >= 1) {
+            for (String str: meteringAdministratorModels) {
+                if(str.equals(userId)) {
+                    return "1";
+                }
+            }
+        }
+        if(gaugerMonitorModels.size() >= 1){
+            for (String str: gaugerMonitorModels) {
+                if(str.equals(userId)) {
+                    return "2";
+                }
+            }
+        }
+        if(gaugerModels.size() >= 1) {
+            for (String str : gaugerModels) {
+                if (str.equals(userId)) {
+                    return "3";
+                }
+            }
+        }
+        return "4";
+    }
+
     @Transactional
     @Override
     public String checkandadd(ComBaseInfo model) {

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -118,6 +118,17 @@
     <result column="IS_BOUND_LIST_DOWNLOADED" jdbcType="VARCHAR" property="isBoundListDownloaded" />
     <result column="DOCUMENT_ID" jdbcType="VARCHAR" property="documentId" />
     <result column="CHECK_FLAG" jdbcType="VARCHAR" property="checkFlag" />
+    <result column="CHECK_MEMO" jdbcType="VARCHAR" property="checkMemo" />
+    <result column="CHECK_MAN1_NO" jdbcType="VARCHAR" property="checkMan1No" />
+    <result column="CHECK_MAN1_NAME" jdbcType="VARCHAR" property="checkMan1Name" />
+    <result column="CHECK_TIME1" jdbcType="TIMESTAMP" property="checkTime1" />
+    <result column="CHECK_MEMO1" jdbcType="VARCHAR" property="checkMemo1" />
+    <result column="CHECK_MAN2_NO" jdbcType="VARCHAR" property="checkMan2No" />
+    <result column="CHECK_MAN2_NAME" jdbcType="VARCHAR" property="checkMan2Name" />
+    <result column="CHECK_TIME2" jdbcType="TIMESTAMP" property="checkTime2" />
+    <result column="CHECK_MEMO2" jdbcType="VARCHAR" property="checkMemo2" />
+    <result column="CHECK_FLAG1" jdbcType="VARCHAR" property="checkFlag1" />
+    <result column="CHECK_FLAG2" jdbcType="VARCHAR" property="checkFlag2" />
   </resultMap>
   <sql id="columns">
     ACTUAL_NO, PREDICTION_NO, NOTICE_NO, CAR_NO, TRAILER_NO, MATTER_NO, MATTER_NAME, 
@@ -139,7 +150,9 @@
     THEORY_AMOUNT, MEASURE_BATCH, MEASURE_BATCH_COUNT, SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE, 
     RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME, 
     CREATE_TIME, DATA_SOURCE, IS_PRE_SCALE, BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, 
-    IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, CHECK_FLAG
+    IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, CHECK_FLAG, CHECK_MEMO, CHECK_MAN1_NO, CHECK_MAN1_NAME, 
+    CHECK_TIME1, CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME, CHECK_TIME2, CHECK_MEMO2, 
+    CHECK_FLAG1, CHECK_FLAG2
   </sql>
   <sql id="columns_alias">
     t.ACTUAL_NO, t.PREDICTION_NO, t.NOTICE_NO, t.CAR_NO, t.TRAILER_NO, t.MATTER_NO, t.MATTER_NAME, 
@@ -163,7 +176,9 @@
     t.MEASURE_BATCH_COUNT, t.SENDER_TYPE, t.SENDER_REMARK, t.RECEIVER_TYPE, t.RECEIVER_REMARK, 
     t.AMOUNT_UNIT, t.MEASURE_OBJECT_TYPE, t.MEASURE_TASK_NUM, t.BILL_TYPE, t.CREATE_MAN_NAME, 
     t.CREATE_TIME, t.DATA_SOURCE, t.IS_PRE_SCALE, t.BOUND_LIST_URL, t.IS_BOUND_LIST, 
-    t.CONTRACT_ID, t.IS_BOUND_LIST_DOWNLOADED, t.DOCUMENT_ID, t.CHECK_FLAG
+    t.CONTRACT_ID, t.IS_BOUND_LIST_DOWNLOADED, t.DOCUMENT_ID, t.CHECK_FLAG, t.CHECK_MEMO, 
+    t.CHECK_MAN1_NO, t.CHECK_MAN1_NAME, t.CHECK_TIME1, t.CHECK_MEMO1, t.CHECK_MAN2_NO, 
+    t.CHECK_MAN2_NAME, t.CHECK_TIME2, t.CHECK_MEMO2, t.CHECK_FLAG1, t.CHECK_FLAG2
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM METER_WORK_CAR_ACTUAL
@@ -521,6 +536,39 @@
       <if test="checkFlag != null and checkFlag != ''">
         and CHECK_FLAG = #{checkFlag}
       </if>
+      <if test="checkMemo != null and checkMemo != ''">
+        and CHECK_MEMO = #{checkMemo}
+      </if>
+      <if test="checkMan1No != null and checkMan1No != ''">
+        and CHECK_MAN1_NO = #{checkMan1No}
+      </if>
+      <if test="checkMan1Name != null and checkMan1Name != ''">
+        and CHECK_MAN1_NAME = #{checkMan1Name}
+      </if>
+      <if test="checkTime1 != null">
+        and TO_CHAR(CHECK_TIME1,'yyyy-MM-dd') = #{checkTime1}
+      </if>
+      <if test="checkMemo1 != null and checkMemo1 != ''">
+        and CHECK_MEMO1 = #{checkMemo1}
+      </if>
+      <if test="checkMan2No != null and checkMan2No != ''">
+        and CHECK_MAN2_NO = #{checkMan2No}
+      </if>
+      <if test="checkMan2Name != null and checkMan2Name != ''">
+        and CHECK_MAN2_NAME = #{checkMan2Name}
+      </if>
+      <if test="checkTime2 != null">
+        and TO_CHAR(CHECK_TIME2,'yyyy-MM-dd') = #{checkTime2}
+      </if>
+      <if test="checkMemo2 != null and checkMemo2 != ''">
+        and CHECK_MEMO2 = #{checkMemo2}
+      </if>
+      <if test="checkFlag1 != null and checkFlag1 != ''">
+        and CHECK_FLAG1 = #{checkFlag1}
+      </if>
+      <if test="checkFlag2 != null and checkFlag2 != ''">
+        and CHECK_FLAG2 = #{checkFlag2}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -873,6 +921,39 @@
       <if test="checkFlag != null and checkFlag != ''">
         and CHECK_FLAG LIKE '%${checkFlag}%'
       </if>
+      <if test="checkMemo != null and checkMemo != ''">
+        and CHECK_MEMO LIKE '%${checkMemo}%'
+      </if>
+      <if test="checkMan1No != null and checkMan1No != ''">
+        and CHECK_MAN1_NO LIKE '%${checkMan1No}%'
+      </if>
+      <if test="checkMan1Name != null and checkMan1Name != ''">
+        and CHECK_MAN1_NAME LIKE '%${checkMan1Name}%'
+      </if>
+      <if test="checkTime1 != null">
+        and TO_CHAR(CHECK_TIME1,'yyyy-MM-dd') = #{checkTime1}
+      </if>
+      <if test="checkMemo1 != null and checkMemo1 != ''">
+        and CHECK_MEMO1 LIKE '%${checkMemo1}%'
+      </if>
+      <if test="checkMan2No != null and checkMan2No != ''">
+        and CHECK_MAN2_NO LIKE '%${checkMan2No}%'
+      </if>
+      <if test="checkMan2Name != null and checkMan2Name != ''">
+        and CHECK_MAN2_NAME LIKE '%${checkMan2Name}%'
+      </if>
+      <if test="checkTime2 != null">
+        and TO_CHAR(CHECK_TIME2,'yyyy-MM-dd') = #{checkTime2}
+      </if>
+      <if test="checkMemo2 != null and checkMemo2 != ''">
+        and CHECK_MEMO2 LIKE '%${checkMemo2}%'
+      </if>
+      <if test="checkFlag1 != null and checkFlag1 != ''">
+        and CHECK_FLAG1 LIKE '%${checkFlag1}%'
+      </if>
+      <if test="checkFlag2 != null and checkFlag2 != ''">
+        and CHECK_FLAG2 LIKE '%${checkFlag2}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -1227,6 +1308,39 @@
       <if test="checkFlag != null and checkFlag != ''">
         or CHECK_FLAG = #{checkFlag}
       </if>
+      <if test="checkMemo != null and checkMemo != ''">
+        or CHECK_MEMO = #{checkMemo}
+      </if>
+      <if test="checkMan1No != null and checkMan1No != ''">
+        or CHECK_MAN1_NO = #{checkMan1No}
+      </if>
+      <if test="checkMan1Name != null and checkMan1Name != ''">
+        or CHECK_MAN1_NAME = #{checkMan1Name}
+      </if>
+      <if test="checkTime1 != null">
+        or TO_CHAR(CHECK_TIME1,'yyyy-MM-dd') = '#{checkTime1}'
+      </if>
+      <if test="checkMemo1 != null and checkMemo1 != ''">
+        or CHECK_MEMO1 = #{checkMemo1}
+      </if>
+      <if test="checkMan2No != null and checkMan2No != ''">
+        or CHECK_MAN2_NO = #{checkMan2No}
+      </if>
+      <if test="checkMan2Name != null and checkMan2Name != ''">
+        or CHECK_MAN2_NAME = #{checkMan2Name}
+      </if>
+      <if test="checkTime2 != null">
+        or TO_CHAR(CHECK_TIME2,'yyyy-MM-dd') = '#{checkTime2}'
+      </if>
+      <if test="checkMemo2 != null and checkMemo2 != ''">
+        or CHECK_MEMO2 = #{checkMemo2}
+      </if>
+      <if test="checkFlag1 != null and checkFlag1 != ''">
+        or CHECK_FLAG1 = #{checkFlag1}
+      </if>
+      <if test="checkFlag2 != null and checkFlag2 != ''">
+        or CHECK_FLAG2 = #{checkFlag2}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual">
     insert into METER_WORK_CAR_ACTUAL (ACTUAL_NO, PREDICTION_NO, NOTICE_NO, 
@@ -1267,8 +1381,11 @@
       MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME, 
       CREATE_TIME, DATA_SOURCE, IS_PRE_SCALE, 
       BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, 
-      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, CHECK_FLAG
-      )
+      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, CHECK_FLAG, 
+      CHECK_MEMO, CHECK_MAN1_NO, CHECK_MAN1_NAME, 
+      CHECK_TIME1, CHECK_MEMO1, CHECK_MAN2_NO, 
+      CHECK_MAN2_NAME, CHECK_TIME2, CHECK_MEMO2, 
+      CHECK_FLAG1, CHECK_FLAG2)
     values (#{actualNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, 
       #{carNo,jdbcType=VARCHAR}, #{trailerNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, 
       #{matterName,jdbcType=VARCHAR}, #{contractNo,jdbcType=VARCHAR}, #{batchNo,jdbcType=VARCHAR}, 
@@ -1307,8 +1424,11 @@
       #{measureTaskNum,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR}, #{createManName,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{dataSource,jdbcType=VARCHAR}, #{isPreScale,jdbcType=VARCHAR}, 
       #{boundListUrl,jdbcType=VARCHAR}, #{isBoundList,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR}, 
-      #{isBoundListDownloaded,jdbcType=VARCHAR}, #{documentId,jdbcType=VARCHAR}, #{checkFlag,jdbcType=VARCHAR}
-      )
+      #{isBoundListDownloaded,jdbcType=VARCHAR}, #{documentId,jdbcType=VARCHAR}, #{checkFlag,jdbcType=VARCHAR}, 
+      #{checkMemo,jdbcType=VARCHAR}, #{checkMan1No,jdbcType=VARCHAR}, #{checkMan1Name,jdbcType=VARCHAR}, 
+      #{checkTime1,jdbcType=TIMESTAMP}, #{checkMemo1,jdbcType=VARCHAR}, #{checkMan2No,jdbcType=VARCHAR}, 
+      #{checkMan2Name,jdbcType=VARCHAR}, #{checkTime2,jdbcType=TIMESTAMP}, #{checkMemo2,jdbcType=VARCHAR}, 
+      #{checkFlag1,jdbcType=VARCHAR}, #{checkFlag2,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual">
     insert into METER_WORK_CAR_ACTUAL
@@ -1661,6 +1781,39 @@
       <if test="checkFlag != null">
         CHECK_FLAG,
       </if>
+      <if test="checkMemo != null">
+        CHECK_MEMO,
+      </if>
+      <if test="checkMan1No != null">
+        CHECK_MAN1_NO,
+      </if>
+      <if test="checkMan1Name != null">
+        CHECK_MAN1_NAME,
+      </if>
+      <if test="checkTime1 != null">
+        CHECK_TIME1,
+      </if>
+      <if test="checkMemo1 != null">
+        CHECK_MEMO1,
+      </if>
+      <if test="checkMan2No != null">
+        CHECK_MAN2_NO,
+      </if>
+      <if test="checkMan2Name != null">
+        CHECK_MAN2_NAME,
+      </if>
+      <if test="checkTime2 != null">
+        CHECK_TIME2,
+      </if>
+      <if test="checkMemo2 != null">
+        CHECK_MEMO2,
+      </if>
+      <if test="checkFlag1 != null">
+        CHECK_FLAG1,
+      </if>
+      <if test="checkFlag2 != null">
+        CHECK_FLAG2,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="actualNo != null">
@@ -2011,6 +2164,39 @@
       <if test="checkFlag != null">
         #{checkFlag,jdbcType=VARCHAR},
       </if>
+      <if test="checkMemo != null">
+        #{checkMemo,jdbcType=VARCHAR},
+      </if>
+      <if test="checkMan1No != null">
+        #{checkMan1No,jdbcType=VARCHAR},
+      </if>
+      <if test="checkMan1Name != null">
+        #{checkMan1Name,jdbcType=VARCHAR},
+      </if>
+      <if test="checkTime1 != null">
+        #{checkTime1,jdbcType=TIMESTAMP},
+      </if>
+      <if test="checkMemo1 != null">
+        #{checkMemo1,jdbcType=VARCHAR},
+      </if>
+      <if test="checkMan2No != null">
+        #{checkMan2No,jdbcType=VARCHAR},
+      </if>
+      <if test="checkMan2Name != null">
+        #{checkMan2Name,jdbcType=VARCHAR},
+      </if>
+      <if test="checkTime2 != null">
+        #{checkTime2,jdbcType=TIMESTAMP},
+      </if>
+      <if test="checkMemo2 != null">
+        #{checkMemo2,jdbcType=VARCHAR},
+      </if>
+      <if test="checkFlag1 != null">
+        #{checkFlag1,jdbcType=VARCHAR},
+      </if>
+      <if test="checkFlag2 != null">
+        #{checkFlag2,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual">
@@ -2129,7 +2315,18 @@
       CONTRACT_ID = #{contractId,jdbcType=VARCHAR},
       IS_BOUND_LIST_DOWNLOADED = #{isBoundListDownloaded,jdbcType=VARCHAR},
       DOCUMENT_ID = #{documentId,jdbcType=VARCHAR},
-      CHECK_FLAG = #{checkFlag,jdbcType=VARCHAR}
+      CHECK_FLAG = #{checkFlag,jdbcType=VARCHAR},
+      CHECK_MEMO = #{checkMemo,jdbcType=VARCHAR},
+      CHECK_MAN1_NO = #{checkMan1No,jdbcType=VARCHAR},
+      CHECK_MAN1_NAME = #{checkMan1Name,jdbcType=VARCHAR},
+      CHECK_TIME1 = #{checkTime1,jdbcType=TIMESTAMP},
+      CHECK_MEMO1 = #{checkMemo1,jdbcType=VARCHAR},
+      CHECK_MAN2_NO = #{checkMan2No,jdbcType=VARCHAR},
+      CHECK_MAN2_NAME = #{checkMan2Name,jdbcType=VARCHAR},
+      CHECK_TIME2 = #{checkTime2,jdbcType=TIMESTAMP},
+      CHECK_MEMO2 = #{checkMemo2,jdbcType=VARCHAR},
+      CHECK_FLAG1 = #{checkFlag1,jdbcType=VARCHAR},
+      CHECK_FLAG2 = #{checkFlag2,jdbcType=VARCHAR}
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual">
@@ -2480,6 +2677,39 @@
       <if test="checkFlag != null">
         CHECK_FLAG = #{checkFlag,jdbcType=VARCHAR},
       </if>
+      <if test="checkMemo != null">
+        CHECK_MEMO = #{checkMemo,jdbcType=VARCHAR},
+      </if>
+      <if test="checkMan1No != null">
+        CHECK_MAN1_NO = #{checkMan1No,jdbcType=VARCHAR},
+      </if>
+      <if test="checkMan1Name != null">
+        CHECK_MAN1_NAME = #{checkMan1Name,jdbcType=VARCHAR},
+      </if>
+      <if test="checkTime1 != null">
+        CHECK_TIME1 = #{checkTime1,jdbcType=TIMESTAMP},
+      </if>
+      <if test="checkMemo1 != null">
+        CHECK_MEMO1 = #{checkMemo1,jdbcType=VARCHAR},
+      </if>
+      <if test="checkMan2No != null">
+        CHECK_MAN2_NO = #{checkMan2No,jdbcType=VARCHAR},
+      </if>
+      <if test="checkMan2Name != null">
+        CHECK_MAN2_NAME = #{checkMan2Name,jdbcType=VARCHAR},
+      </if>
+      <if test="checkTime2 != null">
+        CHECK_TIME2 = #{checkTime2,jdbcType=TIMESTAMP},
+      </if>
+      <if test="checkMemo2 != null">
+        CHECK_MEMO2 = #{checkMemo2,jdbcType=VARCHAR},
+      </if>
+      <if test="checkFlag1 != null">
+        CHECK_FLAG1 = #{checkFlag1,jdbcType=VARCHAR},
+      </if>
+      <if test="checkFlag2 != null">
+        CHECK_FLAG2 = #{checkFlag2,jdbcType=VARCHAR},
+      </if>
     </set>
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </update>
@@ -2541,7 +2771,11 @@
       CREATE_TIME, DATA_SOURCE, IS_PRE_SCALE, 
       BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, 
       IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, 
-      CHECK_FLAG)
+      CHECK_FLAG, CHECK_MEMO, CHECK_MAN1_NO, 
+      CHECK_MAN1_NAME, CHECK_TIME1, 
+      CHECK_MEMO1, CHECK_MAN2_NO, CHECK_MAN2_NAME, 
+      CHECK_TIME2, CHECK_MEMO2, CHECK_FLAG1, 
+      CHECK_FLAG2)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.actualNo,jdbcType=VARCHAR}, 
@@ -2588,7 +2822,11 @@
       #{item.createTime,jdbcType=TIMESTAMP}, #{item.dataSource,jdbcType=VARCHAR}, #{item.isPreScale,jdbcType=VARCHAR}, 
       #{item.boundListUrl,jdbcType=VARCHAR}, #{item.isBoundList,jdbcType=VARCHAR}, #{item.contractId,jdbcType=VARCHAR}, 
       #{item.isBoundListDownloaded,jdbcType=VARCHAR}, #{item.documentId,jdbcType=VARCHAR}, 
-      #{item.checkFlag,jdbcType=VARCHAR} from dual  
+      #{item.checkFlag,jdbcType=VARCHAR}, #{item.checkMemo,jdbcType=VARCHAR}, #{item.checkMan1No,jdbcType=VARCHAR}, 
+      #{item.checkMan1Name,jdbcType=VARCHAR}, #{item.checkTime1,jdbcType=TIMESTAMP}, 
+      #{item.checkMemo1,jdbcType=VARCHAR}, #{item.checkMan2No,jdbcType=VARCHAR}, #{item.checkMan2Name,jdbcType=VARCHAR}, 
+      #{item.checkTime2,jdbcType=TIMESTAMP}, #{item.checkMemo2,jdbcType=VARCHAR}, #{item.checkFlag1,jdbcType=VARCHAR}, 
+      #{item.checkFlag2,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -3058,6 +3296,50 @@
        <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkFlag,jdbcType=VARCHAR}
        </foreach>
+       ,CHECK_MEMO=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkMemo,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_MAN1_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkMan1No,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_MAN1_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkMan1Name,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_TIME1=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkTime1,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CHECK_MEMO1=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkMemo1,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_MAN2_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkMan2No,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_MAN2_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkMan2Name,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_TIME2=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkTime2,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CHECK_MEMO2=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkMemo2,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_FLAG1=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkFlag1,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_FLAG2=
+       <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
+          when #{item.actualNo,jdbcType=VARCHAR} then #{item.checkFlag2,jdbcType=VARCHAR}
+       </foreach>
      where ACTUAL_NO in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.actualNo,jdbcType=VARCHAR}
@@ -4447,4 +4729,5 @@
       and A.car_no like '%${carNo}%'
     </if>
   </select>
+  
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcaractual/model/MeterWorkCarActual.java

@@ -705,6 +705,72 @@ public class MeterWorkCarActual implements IBasePO<String> {
     @ApiModelProperty(value="审核状态（0：未审核；1：已审核）",required=false)
     private String checkFlag;
 
+    /**
+     * 审核人原因(CHECK_MEMO,VARCHAR,255)
+     */
+    @ApiModelProperty(value="审核人原因",required=false)
+    private String checkMemo;
+
+    /**
+     * 二级审核人编号(CHECK_MAN1_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="二级审核人编号",required=false)
+    private String checkMan1No;
+
+    /**
+     * 二级审核人(CHECK_MAN1_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="二级审核人",required=false)
+    private String checkMan1Name;
+
+    /**
+     * 二级审核时间(CHECK_TIME1,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="二级审核时间",required=false)
+    private Date checkTime1;
+
+    /**
+     * 二级审核原因(CHECK_MEMO1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="二级审核原因",required=false)
+    private String checkMemo1;
+
+    /**
+     * 三级审核人编号(CHECK_MAN2_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="三级审核人编号",required=false)
+    private String checkMan2No;
+
+    /**
+     * 三级审核人(CHECK_MAN2_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="三级审核人",required=false)
+    private String checkMan2Name;
+
+    /**
+     * 三级审核时间(CHECK_TIME2,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="三级审核时间",required=false)
+    private Date checkTime2;
+
+    /**
+     * 三级审核原因(CHECK_MEMO2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="三级审核原因",required=false)
+    private String checkMemo2;
+
+    /**
+     * 二级审核状态(CHECK_FLAG1,VARCHAR,1)
+     */
+    @ApiModelProperty(value="二级审核状态",required=false)
+    private String checkFlag1;
+
+    /**
+     * 三级审核状态(CHECK_FLAG2,VARCHAR,1)
+     */
+    @ApiModelProperty(value="三级审核状态",required=false)
+    private String checkFlag2;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1645,6 +1711,94 @@ public class MeterWorkCarActual implements IBasePO<String> {
         this.checkFlag = checkFlag == null ? null : checkFlag.trim();
     }
 
+    public String getCheckMemo() {
+        return checkMemo;
+    }
+
+    public void setCheckMemo(String checkMemo) {
+        this.checkMemo = checkMemo == null ? null : checkMemo.trim();
+    }
+
+    public String getCheckMan1No() {
+        return checkMan1No;
+    }
+
+    public void setCheckMan1No(String checkMan1No) {
+        this.checkMan1No = checkMan1No == null ? null : checkMan1No.trim();
+    }
+
+    public String getCheckMan1Name() {
+        return checkMan1Name;
+    }
+
+    public void setCheckMan1Name(String checkMan1Name) {
+        this.checkMan1Name = checkMan1Name == null ? null : checkMan1Name.trim();
+    }
+
+    public Date getCheckTime1() {
+        return checkTime1;
+    }
+
+    public void setCheckTime1(Date checkTime1) {
+        this.checkTime1 = checkTime1;
+    }
+
+    public String getCheckMemo1() {
+        return checkMemo1;
+    }
+
+    public void setCheckMemo1(String checkMemo1) {
+        this.checkMemo1 = checkMemo1 == null ? null : checkMemo1.trim();
+    }
+
+    public String getCheckMan2No() {
+        return checkMan2No;
+    }
+
+    public void setCheckMan2No(String checkMan2No) {
+        this.checkMan2No = checkMan2No == null ? null : checkMan2No.trim();
+    }
+
+    public String getCheckMan2Name() {
+        return checkMan2Name;
+    }
+
+    public void setCheckMan2Name(String checkMan2Name) {
+        this.checkMan2Name = checkMan2Name == null ? null : checkMan2Name.trim();
+    }
+
+    public Date getCheckTime2() {
+        return checkTime2;
+    }
+
+    public void setCheckTime2(Date checkTime2) {
+        this.checkTime2 = checkTime2;
+    }
+
+    public String getCheckMemo2() {
+        return checkMemo2;
+    }
+
+    public void setCheckMemo2(String checkMemo2) {
+        this.checkMemo2 = checkMemo2 == null ? null : checkMemo2.trim();
+    }
+
+    public String getCheckFlag1() {
+        return checkFlag1;
+    }
+
+    public void setCheckFlag1(String checkFlag1) {
+        this.checkFlag1 = checkFlag1 == null ? null : checkFlag1.trim();
+    }
+
+    public String getCheckFlag2() {
+        return checkFlag2;
+    }
+
+    public void setCheckFlag2(String checkFlag2) {
+        this.checkFlag2 = checkFlag2 == null ? null : checkFlag2.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1767,6 +1921,17 @@ public class MeterWorkCarActual implements IBasePO<String> {
         sb.append(", isBoundListDownloaded=").append(isBoundListDownloaded);
         sb.append(", documentId=").append(documentId);
         sb.append(", checkFlag=").append(checkFlag);
+        sb.append(", checkMemo=").append(checkMemo);
+        sb.append(", checkMan1No=").append(checkMan1No);
+        sb.append(", checkMan1Name=").append(checkMan1Name);
+        sb.append(", checkTime1=").append(checkTime1);
+        sb.append(", checkMemo1=").append(checkMemo1);
+        sb.append(", checkMan2No=").append(checkMan2No);
+        sb.append(", checkMan2Name=").append(checkMan2Name);
+        sb.append(", checkTime2=").append(checkTime2);
+        sb.append(", checkMemo2=").append(checkMemo2);
+        sb.append(", checkFlag1=").append(checkFlag1);
+        sb.append(", checkFlag2=").append(checkFlag2);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/model/MeterWorkCarActualFirst.java

@@ -3,13 +3,14 @@ package com.steerinfo.meterwork.meterworkcaractualfirst.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
 @ApiModel(value="计量汽车衡一次数据表")
 public class MeterWorkCarActualFirst implements IBasePO<String> {
     /**
-     * 计量作业编号（YYYYMMDD+4位流水）(ACTUAL_FIRST_NO,VARCHAR,20)
+     * 计量作业编号（YYYYMMDD+4位流水）(ACTUAL_FIRST_NO,VARCHAR,50)
      */
     @ApiModelProperty(value="计量作业编号（YYYYMMDD+4位流水）",required=true)
     private String actualFirstNo;
@@ -63,7 +64,7 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
     private String batchNo;
 
     /**
-     * 供应商编号(CUSTOMER_SUPPLIER_NO,VARCHAR,20)
+     * 供应商编号(CUSTOMER_SUPPLIER_NO,VARCHAR,30)
      */
     @ApiModelProperty(value="供应商编号",required=false)
     private String customerSupplierNo;
@@ -75,7 +76,7 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
     private String customerSupplierName;
 
     /**
-     * 发货单位编号(FORWARDING_UNIT_NO,VARCHAR,20)
+     * 发货单位编号(FORWARDING_UNIT_NO,VARCHAR,30)
      */
     @ApiModelProperty(value="发货单位编号",required=false)
     private String forwardingUnitNo;
@@ -87,7 +88,7 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
     private String forwardingUnitName;
 
     /**
-     * 收货单位编号(RECEIVING_UINT_NO,VARCHAR,20)
+     * 收货单位编号(RECEIVING_UINT_NO,VARCHAR,30)
      */
     @ApiModelProperty(value="收货单位编号",required=false)
     private String receivingUintNo;
@@ -200,12 +201,6 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
     @ApiModelProperty(value="计量类型编号（业务类型）",required=false)
     private String meterTypeNo;
 
-    /**
-     * 计量类型名称（业务类型）(METER_TYPE_NAME,VARCHAR,30)
-     */
-    @ApiModelProperty(value="计量类型名称（业务类型）",required=false)
-    private String meterTypeName;
-
     /**
      * 火车车号(RAILWAY_NO,VARCHAR,20)
      */
@@ -537,9 +532,9 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
     private String measureTaskNum;
 
     /**
-     * 数据来源(1=智能终端，2=本地计量，3=应急计量，4=手动录入(计量票据录入))(DATA_SOURCE,VARCHAR,2)
+     * 数据来源(1=智能终端，2=集中计量，3=应急计量，4=手动录入(计量票据录入))(DATA_SOURCE,VARCHAR,2)
      */
-    @ApiModelProperty(value="数据来源(1=智能终端，2=本地计量，3=应急计量，4=手动录入(计量票据录入))",required=false)
+    @ApiModelProperty(value="数据来源(1=智能终端，2=集中计量，3=应急计量，4=手动录入(计量票据录入))",required=false)
     private String dataSource;
 
     /**
@@ -548,6 +543,78 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
     @ApiModelProperty(value="是否匹配委托（0:未匹配，1:已匹配）",required=false)
     private String isPreScale;
 
+    /**
+     * 计量类型名称（业务类型）(METER_TYPE_NAME,VARCHAR,30)
+     */
+    @ApiModelProperty(value="计量类型名称（业务类型）",required=false)
+    private String meterTypeName;
+
+    /**
+     * 审核人原因(CHECK_MEMO,VARCHAR,255)
+     */
+    @ApiModelProperty(value="审核人原因",required=false)
+    private String checkMemo;
+
+    /**
+     * 二级审核人编号(CHECK_MAN1_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="二级审核人编号",required=false)
+    private String checkMan1No;
+
+    /**
+     * 二级审核人(CHECK_MAN1_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="二级审核人",required=false)
+    private String checkMan1Name;
+
+    /**
+     * 二级审核时间(CHECK_TIME1,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="二级审核时间",required=false)
+    private Date checkTime1;
+
+    /**
+     * 二级审核原因(CHECK_MEMO1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="二级审核原因",required=false)
+    private String checkMemo1;
+
+    /**
+     * 三级审核人编号(CHECK_MAN2_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="三级审核人编号",required=false)
+    private String checkMan2No;
+
+    /**
+     * 三级审核人(CHECK_MAN2_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="三级审核人",required=false)
+    private String checkMan2Name;
+
+    /**
+     * 三级审核时间(CHECK_TIME2,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="三级审核时间",required=false)
+    private Date checkTime2;
+
+    /**
+     * 三级审核原因(CHECK_MEMO2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="三级审核原因",required=false)
+    private String checkMemo2;
+
+    /**
+     * 二级审核状态(CHECK_FLAG1,VARCHAR,1)
+     */
+    @ApiModelProperty(value="二级审核状态",required=false)
+    private String checkFlag1;
+
+    /**
+     * 三级审核状态(CHECK_FLAG2,VARCHAR,1)
+     */
+    @ApiModelProperty(value="三级审核状态",required=false)
+    private String checkFlag2;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -816,14 +883,6 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
         this.meterTypeNo = meterTypeNo == null ? null : meterTypeNo.trim();
     }
 
-    public String getMeterTypeName() {
-        return meterTypeName;
-    }
-
-    public void setMeterTypeName(String meterTypeName) {
-        this.meterTypeName = meterTypeName == null ? null : meterTypeName.trim();
-    }
-
     public String getRailwayNo() {
         return railwayNo;
     }
@@ -1280,6 +1339,102 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
         this.isPreScale = isPreScale == null ? null : isPreScale.trim();
     }
 
+    public String getMeterTypeName() {
+        return meterTypeName;
+    }
+
+    public void setMeterTypeName(String meterTypeName) {
+        this.meterTypeName = meterTypeName == null ? null : meterTypeName.trim();
+    }
+
+    public String getCheckMemo() {
+        return checkMemo;
+    }
+
+    public void setCheckMemo(String checkMemo) {
+        this.checkMemo = checkMemo == null ? null : checkMemo.trim();
+    }
+
+    public String getCheckMan1No() {
+        return checkMan1No;
+    }
+
+    public void setCheckMan1No(String checkMan1No) {
+        this.checkMan1No = checkMan1No == null ? null : checkMan1No.trim();
+    }
+
+    public String getCheckMan1Name() {
+        return checkMan1Name;
+    }
+
+    public void setCheckMan1Name(String checkMan1Name) {
+        this.checkMan1Name = checkMan1Name == null ? null : checkMan1Name.trim();
+    }
+
+    public Date getCheckTime1() {
+        return checkTime1;
+    }
+
+    public void setCheckTime1(Date checkTime1) {
+        this.checkTime1 = checkTime1;
+    }
+
+    public String getCheckMemo1() {
+        return checkMemo1;
+    }
+
+    public void setCheckMemo1(String checkMemo1) {
+        this.checkMemo1 = checkMemo1 == null ? null : checkMemo1.trim();
+    }
+
+    public String getCheckMan2No() {
+        return checkMan2No;
+    }
+
+    public void setCheckMan2No(String checkMan2No) {
+        this.checkMan2No = checkMan2No == null ? null : checkMan2No.trim();
+    }
+
+    public String getCheckMan2Name() {
+        return checkMan2Name;
+    }
+
+    public void setCheckMan2Name(String checkMan2Name) {
+        this.checkMan2Name = checkMan2Name == null ? null : checkMan2Name.trim();
+    }
+
+    public Date getCheckTime2() {
+        return checkTime2;
+    }
+
+    public void setCheckTime2(Date checkTime2) {
+        this.checkTime2 = checkTime2;
+    }
+
+    public String getCheckMemo2() {
+        return checkMemo2;
+    }
+
+    public void setCheckMemo2(String checkMemo2) {
+        this.checkMemo2 = checkMemo2 == null ? null : checkMemo2.trim();
+    }
+
+    public String getCheckFlag1() {
+        return checkFlag1;
+    }
+
+    public void setCheckFlag1(String checkFlag1) {
+        this.checkFlag1 = checkFlag1 == null ? null : checkFlag1.trim();
+    }
+
+    public String getCheckFlag2() {
+        return checkFlag2;
+    }
+
+    public void setCheckFlag2(String checkFlag2) {
+        this.checkFlag2 = checkFlag2 == null ? null : checkFlag2.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1318,7 +1473,6 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
         sb.append(", predictionType=").append(predictionType);
         sb.append(", predictionCombination=").append(predictionCombination);
         sb.append(", meterTypeNo=").append(meterTypeNo);
-        sb.append(", meterTypeName=").append(meterTypeName);
         sb.append(", railwayNo=").append(railwayNo);
         sb.append(", meterProcessNo=").append(meterProcessNo);
         sb.append(", meterProcessEditionNo=").append(meterProcessEditionNo);
@@ -1376,6 +1530,18 @@ public class MeterWorkCarActualFirst implements IBasePO<String> {
         sb.append(", measureTaskNum=").append(measureTaskNum);
         sb.append(", dataSource=").append(dataSource);
         sb.append(", isPreScale=").append(isPreScale);
+        sb.append(", meterTypeName=").append(meterTypeName);
+        sb.append(", checkMemo=").append(checkMemo);
+        sb.append(", checkMan1No=").append(checkMan1No);
+        sb.append(", checkMan1Name=").append(checkMan1Name);
+        sb.append(", checkTime1=").append(checkTime1);
+        sb.append(", checkMemo1=").append(checkMemo1);
+        sb.append(", checkMan2No=").append(checkMan2No);
+        sb.append(", checkMan2Name=").append(checkMan2Name);
+        sb.append(", checkTime2=").append(checkTime2);
+        sb.append(", checkMemo2=").append(checkMemo2);
+        sb.append(", checkFlag1=").append(checkFlag1);
+        sb.append(", checkFlag2=").append(checkFlag2);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/controller/MeterWorkCheckFirstActualController.java

@@ -114,8 +114,8 @@ public class MeterWorkCheckFirstActualController extends BaseRESTfulController {
     @ApiOperation(value="新增数据配置", notes="新增数据配置")
     @PostMapping(value = "/addModel")
     public RESTfulResult addModel(@RequestBody MeterWorkCheckFirstActual model){
-        MeterWorkCheckFirstActual meterWorkCheckFirstActual = meterWorkCheckFirstActualService.addModel(model);
-        return success(meterWorkCheckFirstActual);
+        RESTfulResult rm = meterWorkCheckFirstActualService.addModel(model);
+        return rm;
     }
 
     @ApiOperation(value = "汽车衡一次计量和结净数据图片与数据核查-获取列表",

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/service/IMeterWorkCheckFirstActualService.java

@@ -1,5 +1,6 @@
 package com.steerinfo.meterwork.meterworkcheckfirstactual.service;
 
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkcheckfirstactual.model.CarActualCountCheckNum;
@@ -25,7 +26,7 @@ import java.util.List;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface IMeterWorkCheckFirstActualService extends IBaseService<MeterWorkCheckFirstActual, String>{
-    MeterWorkCheckFirstActual addModel(MeterWorkCheckFirstActual model);
+    RESTfulResult addModel(MeterWorkCheckFirstActual model);
     List<HashMap> carFirstActualImgDataList(HashMap<String, Object> params);
     PageList<CarActualCountCheckNum> carActualCountCheckNum(HashMap<String, Object> params);
     PageList<CarFirstCountCheckNum> carFirstCountCheckNum(HashMap<String, Object> params);

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/service/impl/MeterWorkCheckFirstActualServiceImpl.java

@@ -1,6 +1,9 @@
 package com.steerinfo.meterwork.meterworkcheckfirstactual.service.impl;
 
+import cn.hutool.core.lang.Assert;
+import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
 import com.steerinfo.baseinfo.meterbasespotinfo.model.MeterBaseSpotInfo;
+import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -23,6 +26,8 @@ import com.steerinfo.util.StringUtils;
 import org.apache.shiro.crypto.hash.Hash;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -64,72 +69,181 @@ public class MeterWorkCheckFirstActualServiceImpl extends BaseServiceImpl<MeterW
     @Resource
     private MeterWorkRailwayActualMapper meterWorkRailwayActualMapper;
 
+    @Resource
+    private ComBaseInfoMapper comBaseInfoMapper;
+
     @Override
     protected IBaseMapper<MeterWorkCheckFirstActual, String> getMapper() {
         return meterWorkCheckFirstActualMapper;
     }
 
     @Override
-    public MeterWorkCheckFirstActual addModel(MeterWorkCheckFirstActual model) {
-        model.setId(PublicMethod.IdCreate(3));
-        long startTime = model.getCheckStartTime().getTime();
-        long endTime = model.getCheckEndTime().getTime();
-        model.setCheckUsedSeconds(new BigDecimal(Math.abs((startTime - endTime)/1000)));
-        String userId;
-        String userName;
+    public RESTfulResult addModel(MeterWorkCheckFirstActual model) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
         try{
+            model.setId(PublicMethod.IdCreate(3));
+            long startTime = model.getCheckStartTime().getTime();
+            long endTime = model.getCheckEndTime().getTime();
+            model.setCheckUsedSeconds(new BigDecimal(Math.abs((startTime - endTime)/1000)));
+
+
             UserPayload payload = UserPayload.getCurrUser();
-            userId = payload.getUserCode();
-            userName = payload.getUserName();
-        }catch(Exception e) {
-            userId = "admin";
-            userName = "admins";
-        }
-        if(model.getTypeNo().equals("001002001")) { //001002001：汽车衡、valueFlag：0（一次数据）、1:（结净数据）
-            if(model.getValueFlag().equals("0")) {
-                MeterWorkCarActualFirst firstModel = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getCheckId());
-                if(firstModel != null) {
-                    firstModel.setCheckManNo(userId);
-                    firstModel.setCheckManName(userName);
-                    firstModel.setCheckTime(new Date());
-                    firstModel.setCheckFlag("2");
-                    meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstModel);
+            String userId = payload.getUserCode();
+            String userName = payload.getUserName();
+            //计量数据管理员
+            HashMap<String, Object> meteringAdministratorMap = new HashMap<>();
+            meteringAdministratorMap.put("pBaseCode", "001058");
+            List<String> meteringAdministratorModels = comBaseInfoMapper.matterNoByBaseCode(meteringAdministratorMap);
+            //计量班长
+            HashMap<String, Object> gaugerMonitorMap = new HashMap<>();
+            gaugerMonitorMap.put("pBaseCode", "001057");
+            List<String> gaugerMonitorModels = comBaseInfoMapper.matterNoByBaseCode(gaugerMonitorMap);
+            //计量员
+            HashMap<String, Object> gaugerMap = new HashMap<>();
+            gaugerMap.put("pBaseCode", "001056");
+            List<String> gaugerModels = comBaseInfoMapper.matterNoByBaseCode(gaugerMap);
+
+            boolean flag = false;
+            if(model.getTypeNo().equals("001002001")) { //001002001：汽车衡、valueFlag：0（一次数据）、1:（结净数据）
+                if(model.getValueFlag().equals("0")) {
+                    if(meteringAdministratorModels.size() >= 1) {
+                        for (String str: meteringAdministratorModels) {
+                            if(str.equals(userId)) {
+                                MeterWorkCarActualFirst firstModel = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getCheckId());
+                                if(firstModel != null) {
+                                    firstModel.setCheckMan2No(userId);
+                                    firstModel.setCheckMan2Name(userName);
+                                    firstModel.setCheckTime2(new Date());
+                                    firstModel.setCheckFlag2("2");
+                                    firstModel.setCheckMemo2(model.getCheckResult());
+                                    meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstModel);
+                                    flag = true;
+                                }
+                            }
+                        }
+                    }
+                    if(flag == false && gaugerMonitorModels.size() >= 1){
+                        for (String str: gaugerMonitorModels) {
+                            if(str.equals(userId)) {
+                                MeterWorkCarActualFirst firstModel = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getCheckId());
+                                if(firstModel != null) {
+                                    firstModel.setCheckMan1No(userId);
+                                    firstModel.setCheckMan1Name(userName);
+                                    firstModel.setCheckTime1(new Date());
+                                    firstModel.setCheckFlag1("2");
+                                    firstModel.setCheckMemo1(model.getCheckResult());
+                                    meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstModel);
+                                    flag = true;
+                                }
+                            }
+                        }
+                    }
+                    if(flag == false &&gaugerModels.size() >= 1) {
+                        for (String str : gaugerModels) {
+                            if (str.equals(userId)) {
+                                MeterWorkCarActualFirst firstModel = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getCheckId());
+                                if (firstModel != null) {
+                                    firstModel.setCheckManNo(userId);
+                                    firstModel.setCheckManName(userName);
+                                    firstModel.setCheckTime(new Date());
+                                    firstModel.setCheckFlag("2");
+                                    firstModel.setCheckMemo(model.getCheckResult());
+                                    meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstModel);
+                                    flag = true;
+                                }
+                            }
+                        }
+                    }
+                }else if(model.getValueFlag().equals("1")) {
+                    if(meteringAdministratorModels.size() >= 1) {
+                        for (String str: meteringAdministratorModels) {
+                            if(str.equals(userId)) {
+                                MeterWorkCarActual actualModel = meterWorkCarActualMapper.selectByPrimaryKey(model.getCheckId());
+                                if(actualModel != null) {
+                                    actualModel.setCheckMan2No(userId);
+                                    actualModel.setCheckMan2Name(userName);
+                                    actualModel.setCheckTime2(new Date());
+                                    actualModel.setCheckFlag2("2");
+                                    actualModel.setCheckMemo2(model.getCheckResult());
+                                    meterWorkCarActualMapper.updateByPrimaryKeySelective(actualModel);
+                                    flag = true;
+                                }
+                            }
+                        }
+                    }
+                    if(gaugerMonitorModels.size() >= 1){
+                        for (String str: gaugerMonitorModels) {
+                            if(str.equals(userId)) {
+                                MeterWorkCarActual actualModel = meterWorkCarActualMapper.selectByPrimaryKey(model.getCheckId());
+                                if(actualModel != null) {
+                                    actualModel.setCheckMan1No(userId);
+                                    actualModel.setCheckMan1Name(userName);
+                                    actualModel.setCheckTime1(new Date());
+                                    actualModel.setCheckFlag1("2");
+                                    actualModel.setCheckMemo1(model.getCheckResult());
+                                    meterWorkCarActualMapper.updateByPrimaryKeySelective(actualModel);
+                                    flag = true;
+                                }
+                            }
+                        }
+                    }
+                    if(gaugerModels.size() >= 1) {
+                        for (String str : gaugerModels) {
+                            if (str.equals(userId)) {
+                                MeterWorkCarActual actualModel = meterWorkCarActualMapper.selectByPrimaryKey(model.getCheckId());
+                                if(actualModel != null) {
+                                    actualModel.setCheckManNo(userId);
+                                    actualModel.setCheckManName(userName);
+                                    actualModel.setCheckTime(new Date());
+                                    actualModel.setCheckFlag("2");
+                                    actualModel.setCheckMemo(model.getCheckResult());
+                                    meterWorkCarActualMapper.updateByPrimaryKeySelective(actualModel);
+                                    flag = true;
+                                }
+                            }
+                        }
+                    }
                 }
-            }else if(model.getValueFlag().equals("1")) {
-                MeterWorkCarActual actualModel = meterWorkCarActualMapper.selectByPrimaryKey(model.getCheckId());
-                if(actualModel != null) {
-                    actualModel.setCheckManNo(userId);
-                    actualModel.setCheckManName(userName);
-                    actualModel.setCheckTime(new Date());
-                    actualModel.setCheckFlag("2");
-                    meterWorkCarActualMapper.updateByPrimaryKeySelective(actualModel);
+            }else {
+                if(model.getValueFlag().equals("0")) {
+                    MeterWorkRailwayActFirst firstModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getCheckId());
+                    if(firstModel != null) {
+                        firstModel.setCheckManNo(userId);
+                        firstModel.setCheckManName(userName);
+                        firstModel.setCheckTime(new Date());
+                        firstModel.setCheckFlag("2");
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(firstModel);
+                    }
+                }else if(model.getValueFlag().equals("1")) {
+                    MeterWorkRailwayActual actualModel = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getCheckId());
+                    if(actualModel != null) {
+                        actualModel.setCheckManNo(userId);
+                        actualModel.setCheckManName(userName);
+                        actualModel.setCheckTime(new Date());
+                        actualModel.setCheckFlag("2");
+                        meterWorkRailwayActualMapper.updateByPrimaryKeySelective(actualModel);
+                    }
                 }
             }
-        }else {
-            if(model.getValueFlag().equals("0")) {
-                MeterWorkRailwayActFirst firstModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getCheckId());
-                if(firstModel != null) {
-                    firstModel.setCheckManNo(userId);
-                    firstModel.setCheckManName(userName);
-                    firstModel.setCheckTime(new Date());
-                    firstModel.setCheckFlag("2");
-                    meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(firstModel);
-                }
-            }else if(model.getValueFlag().equals("1")) {
-                MeterWorkRailwayActual actualModel = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getCheckId());
-                if(actualModel != null) {
-                    actualModel.setCheckManNo(userId);
-                    actualModel.setCheckManName(userName);
-                    actualModel.setCheckTime(new Date());
-                    actualModel.setCheckFlag("2");
-                    meterWorkRailwayActualMapper.updateByPrimaryKeySelective(actualModel);
-                }
+            if(flag == false) {
+                rm.setMessage("该"+ userName + "账号不能审核，没有审核权限！！");
+                return rm;
             }
+            model.setCheckManNo(userId);
+            model.setCheckManName(userName);
+            meterWorkCheckFirstActualMapper.insert(model);
+
+            rm.setSucceed(true);
+            rm.setData(model);
+            rm.setMessage("操作成功");
+            rm.setCode("200");
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常！！" + e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
-        model.setCheckManNo(userId);
-        model.setCheckManName(userName);
-        meterWorkCheckFirstActualMapper.insert(model);
-        return model;
+        return rm;
     }
 
     @Override

src/main/java/com/steerinfo/meterwork/meterworkmonitor/model/MeterWorkMonitor.java

@@ -1018,7 +1018,9 @@ public class MeterWorkMonitor implements IBasePO<String> {
         this.zeroState = zeroState;
         this.zeroWeight = zeroWeight;
         this.isZeroState = isZeroState;
+        this.isValidScan = isValidScan;
         this.isEnableSound = isEnableSound;
+        this.photoCar2 = photoCar2;
         this.userId = userId;
         this.userName = userName;
     }
@@ -1087,6 +1089,9 @@ public class MeterWorkMonitor implements IBasePO<String> {
         this.zeroState = meterWorkMonitor.zeroState;
         this.zeroWeight = meterWorkMonitor.zeroWeight;
         this.isZeroState = meterWorkMonitor.isZeroState;
+        this.isValidScan = meterWorkMonitor.isValidScan;
+        this.isEnableSound = meterWorkMonitor.isEnableSound;
+        this.photoCar2 = meterWorkMonitor.photoCar2;
         this.isEnableSound = meterWorkMonitor.isEnableSound;
         this.userId = meterWorkMonitor.userId;
         this.userName = meterWorkMonitor.userName;