修改

src/main/java/com/steerinfo/meterwork/meterworkcaractual/controller/MeterWorkCarActualController.java

@@ -1015,4 +1015,17 @@ throw new MarkerMetException(500, "操作异常！！");
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "小洁净和负洁净重量比对核查-获取列表", notes = "分页模糊查询")
+    //@RequiresPermissions("meterworkcaractualfirst:view")
+    @PostMapping(value = "/smallAndNegativeNetWeightRatio")
+    public RESTfulResult smallAndNegativeNetWeightRatio(@RequestBody(required = false) HashMap parmas) {
+        try {
+            PageList<MeterWorkCarActualTHJCompare> list = meterWorkCarActualService.smallAndNegativeNetWeightRatio(parmas, Integer.parseInt(parmas.get("pageNum").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

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

@@ -70,4 +70,7 @@ public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual
     //查询符合内倒双委托车辆在铁合金秤点用普通委托信息过磅的结净信息倒序
     List<MeterWorkCarActual> findTHJNetWeight(Map<String, Object> params);
     List<MeterWorkCarActual> findFiveNetWeight(Map<String, Object> params);
+
+    //小洁净和负洁净重量比对核查
+    List<MeterWorkCarActual> smallAndNegativeNetWeightRatio(Map<String, Object> params);
 }

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

@@ -4374,4 +4374,50 @@
             B.meter_type_no,
             B.meter_type_name
   </select>
+
+  <select id="smallAndNegativeNetWeightRatio" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    select A.car_no,
+          A.prediction_no,
+          A.matter_name,
+          A.gross_weight,
+          A.tare_weight,
+          A.net_weight,
+          A.update_man_name,
+          A.update_time,
+          A.note,
+          A.sender_remark,
+          A.forwarding_unit_name,
+          A.receiving_uint_name,
+          A.gross_time,
+          A.base_spot1_name,
+          case when A.gross_mode = '1' then '远程计量'
+          when A.gross_mode = '2' then '智能计量'
+          when A.gross_mode = '3' then '手工计量'
+          else null end gross_mode,
+          A.gross_man_name,
+          A.tare_time,
+          A.base_spot2_name,
+          case when A.tare_mode = '1' then '远程计量'
+          when A.tare_mode = '2' then '智能计量'
+          when A.tare_mode = '3' then '手工计量'
+          else null end tare_mode,
+          A.tare_man_name,
+          A.net_time,
+          A.net_man_name,
+          case when A.value_flag = '0' then '作废'
+          when A.value_flag = '1' then '有效'
+          else null end value_flag,
+          case when A.upload_flag = '1' then '未同步'
+          when A.upload_flag = '2' then '已同步'
+          else null end upload_flag
+    from meter_work_car_actual A
+    where A.net_weight &lt;= 2000
+        and A.value_flag != '0'
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="carNo != null and carNo != ''">
+      and A.car_no like '%${carNo}%'
+    </if>
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/IMeterWorkCarActualService.java

@@ -109,5 +109,6 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
     List<HashMap> countAllSpotSate(HashMap params);
     PageList<HashMap> netWeightAndTheoryAmount(HashMap params);
     List<MeterWorkCarActualTHJCompare> findCommonAndInnerDouble(HashMap params);
+    PageList<MeterWorkCarActual> smallAndNegativeNetWeightRatio(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
 
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -3121,4 +3121,12 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         return models;
     }
 
+    @Override
+    public PageList<MeterWorkCarActual> smallAndNegativeNetWeightRatio(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<MeterWorkCarActual> rows = meterWorkCarActualMapper.smallAndNegativeNetWeightRatio(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.xml

@@ -675,7 +675,8 @@
 
     <select id="hookTareWeightAndTheoryAmount" parameterType="java.util.HashMap"
             resultType="com.steerinfo.meterwork.meterworkdatacount.model.HookTareWeightAndTheoryAmount">
-        select A.railway_no railwayNo,
+        select A.actual_no actualNo,
+           A.railway_no railwayNo,
            A.prediction_no predictionNo,
            A.matter_no matterNo,
            A.matter_name matterName,
@@ -694,11 +695,16 @@
            A.net_time netTime,
            A.net_spot3_name netSpot3Name,
            A.net_man_name netManName,
-           A.note note
+           A.note note,
+           A.check_man_no checkManNo,
+           A.check_man_name checkManName,
+           A.check_time checkTime,
+           A.memo memo
       from meter_work_railway_actual A
       left join com_base_info B
         on B.base_name = subStr(A.railway_no, length(A.railway_no) - 2)
      where A.railway_type_no = '001019005'
+        and abs(round((A.tare_weight - to_number(B.memo)*1000) / 1000, 2)) >= 2
         <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
             and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
             and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
@@ -711,7 +717,8 @@
 
     <select id="twoMillionTareWeightComparison" parameterType="java.util.HashMap"
             resultType="com.steerinfo.meterwork.meterworkdatacount.model.TwoMillionTareWeightComparison">
-        select A.railway_no railwayNo,
+        select A.actual_no actualNo,
+            A.railway_no railwayNo,
             A.prediction_no predictionNo,
             A.matter_name matterName,
             A.forwarding_unit_name forwardingUnitName,
@@ -744,11 +751,16 @@
                 else null end uploadFlag，
             A.Sender_Remark senderRemark,
             A.conveyance_type conveyanceType,
-            A.note note
+            A.note note,
+            A.check_man_no checkManNo,
+            A.check_man_name checkManName,
+            A.check_time checkTime,
+            A.memo memo
         from meter_work_railway_actual A
             left join com_base_info B
                 on B.base_name = subStr(A.railway_no, length(A.railway_no) - 2)
         where A.railway_type_no = '001019003'
+            and abs(round((A.tare_weight - (to_number(B.memo) + 37.5)*1000) / 1000, 2)) >= 2
             <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
                 and  A.net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
                 and A.net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')

src/main/java/com/steerinfo/meterwork/meterworkdatacount/model/HookTareWeightAndTheoryAmount.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 public class HookTareWeightAndTheoryAmount {
+    private String actualNo;
     private String railwayNo;
     private String predictionNo;
     private String matterNo;
@@ -24,6 +25,18 @@ public class HookTareWeightAndTheoryAmount {
     private String netSpot3Name;
     private String netManName;
     private String note;
+    private String checkManNo;
+    private String checkManName;
+    private Date checkTime;
+    private String memo;
+
+    public String getActualNo() {
+        return actualNo;
+    }
+
+    public void setActualNo(String actualNo) {
+        this.actualNo = actualNo;
+    }
 
     public String getRailwayNo() {
         return railwayNo;
@@ -184,4 +197,36 @@ public class HookTareWeightAndTheoryAmount {
     public void setNote(String note) {
         this.note = note;
     }
+
+    public String getCheckManNo() {
+        return checkManNo;
+    }
+
+    public void setCheckManNo(String checkManNo) {
+        this.checkManNo = checkManNo;
+    }
+
+    public String getCheckManName() {
+        return checkManName;
+    }
+
+    public void setCheckManName(String checkManName) {
+        this.checkManName = checkManName;
+    }
+
+    public Date getCheckTime() {
+        return checkTime;
+    }
+
+    public void setCheckTime(Date checkTime) {
+        this.checkTime = checkTime;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/model/TwoMillionTareWeightComparison.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 public class TwoMillionTareWeightComparison {
+    private String actualNo;
     private String railwayNo;
     private String predictionNo;
     private String matterName;
@@ -28,6 +29,18 @@ public class TwoMillionTareWeightComparison {
     private String senderRemark;
     private String conveyanceType;
     private String note;
+    private String checkManNo;
+    private String checkManName;
+    private Date checkTime;
+    private String memo;
+
+    public String getActualNo() {
+        return actualNo;
+    }
+
+    public void setActualNo(String actualNo) {
+        this.actualNo = actualNo;
+    }
 
     public String getRailwayNo() {
         return railwayNo;
@@ -220,4 +233,36 @@ public class TwoMillionTareWeightComparison {
     public void setNote(String note) {
         this.note = note;
     }
+
+    public String getCheckManNo() {
+        return checkManNo;
+    }
+
+    public void setCheckManNo(String checkManNo) {
+        this.checkManNo = checkManNo;
+    }
+
+    public String getCheckManName() {
+        return checkManName;
+    }
+
+    public void setCheckManName(String checkManName) {
+        this.checkManName = checkManName;
+    }
+
+    public Date getCheckTime() {
+        return checkTime;
+    }
+
+    public void setCheckTime(Date checkTime) {
+        this.checkTime = checkTime;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
 }

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

@@ -1250,4 +1250,16 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "轨道衡审核功能", notes = "轨道衡审核功能")
+    @PostMapping(value = "/auditRailwayActual")
+    public RESTfulResult auditRailwayActual(@RequestBody List<MeterWorkRailwayActual> params) {
+        try {
+            RESTfulResult rm = meterWorkRailwayActualService.auditRailwayActual(params);
+            return rm;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/mapper/MeterWorkRailwayActualMapper.xml

@@ -4386,7 +4386,7 @@
     from meter_work_railway_actual
       where 1 = 1
       <if test="railwayNo != null and railwayNo != ''">
-        and railway_no like '%railwayNo%'
+        and railway_no like '%${railwayNo}%'
       </if>
       and forwarding_unit_no in
       <foreach collection="list" item="id" separator="," open="(" close=")">
@@ -4448,7 +4448,7 @@
     where 1 = 1
     and value_flag != '0'
     <if test="railwayNo != null and railwayNo != ''">
-      and railway_no like '%railwayNo%'
+      and railway_no like '%${railwayNo}%'
     </if>
     <if test="matterNo != null and matterNo != ''">
       and MATTER_NO LIKE '%${matterNo}%'

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

@@ -129,4 +129,5 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
     int updateCar(MeterWorkRailwayActual model);
 
     PageList<HashMap> dynamicAndStaticCompare(HashMap<String, Object> parameters, Integer pageNum, Integer pageSize);
+    RESTfulResult auditRailwayActual(List<MeterWorkRailwayActual> models);
 }

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

@@ -206,7 +206,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     throw new MarkerMetException(500, "只有未结算的结净数据才能进行撤销发布操作");
                 }
             }
-            UserPayload userPayload = new UserPayload();
+            UserPayload userPayload = UserPayload.getCurrUser();
             String userName = userPayload.getUserName();
             String userId = userPayload.getUserCode();
             int count = 0;
@@ -226,9 +226,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 logModel.setCreateTime(new Date());
                 logModel.setOperationPage("web端-轨道衡净重数据维护");
                 logModel.setOperationFunction("批量取消发布");
-                logModel.setOperationId(model.getActualNo());
-                logModel.setOperationPredictionNo(model.getPredictionNo());
-                logModel.setOperationCarnNo(model.getRailwayNo());
+                logModel.setOperationId(modelTemp.getActualNo());
+                logModel.setOperationPredictionNo(modelTemp.getPredictionNo());
+                logModel.setOperationCarnNo(modelTemp.getRailwayNo());
                 meterBaseOperationLogMapper.insertSelective(logModel);
                 count ++;
             }
@@ -4354,4 +4354,37 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
+
+    @Override
+    @Transactional(rollbackFor=Exception.class)
+    public RESTfulResult auditRailwayActual(List<MeterWorkRailwayActual> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            UserPayload userPayload = UserPayload.getCurrUser();
+            String userId = userPayload.getUserCode();
+            String userName = userPayload.getUserName();
+            int count = 0;
+            if(models.size() >= 1) {
+                for(MeterWorkRailwayActual modelTemp: models) {
+                    MeterWorkRailwayActual model = meterWorkRailwayActualMapper.selectByPrimaryKey(modelTemp.getActualNo());
+                    if(model != null) {
+                        model.setCheckManNo(userId);
+                        model.setCheckManName(userName);
+                        model.setCheckTime(new Date());
+                        model.setMemo(model.getMemo());
+                        meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
+                        count ++;
+                    }
+                }
+            }
+            rm.setSucceed(true);
+            rm.setMessage("操作成功,共有" + count + "条数据审核成功！");
+            rm.setCode("200");
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常:>>>" + e.getMessage());
+        }
+        return rm;
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkshiftreport/controller/MeterWorkShiftReportController.java

@@ -107,7 +107,7 @@ public class MeterWorkShiftReportController extends BaseRESTfulController {
     @ApiOperation(value="根据日期查询", notes="只能查询一条数据")
     @PostMapping(value = "/likeByCreateTime")
     public RESTfulResult likeByCreateTime(@RequestBody HashMap parmas){
-        MeterWorkShiftReport list = meterWorkShiftReportService.likeByCreateTime(parmas);
+        PageList<MeterWorkShiftReport> list = meterWorkShiftReportService.likeByCreateTime(parmas);
         return success(list);
     }
 

src/main/java/com/steerinfo/meterwork/meterworkshiftreport/mapper/MeterWorkShiftReportMapper.java

@@ -5,8 +5,9 @@ import com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.HashMap;
+import java.util.List;
 
 @Mapper
 public interface MeterWorkShiftReportMapper extends IBaseMapper<MeterWorkShiftReport, String> {
-    MeterWorkShiftReport likeByCreateTime(HashMap<String, Object> params);
+    List<MeterWorkShiftReport> likeByCreateTime(HashMap<String, Object> params);
 }

src/main/java/com/steerinfo/meterwork/meterworkshiftreport/mapper/MeterWorkShiftReportMapper.xml

@@ -8,14 +8,6 @@
     <result column="METER_GROUP" jdbcType="VARCHAR" property="meterGroup" />
     <result column="SHIFT_MAN_NO" jdbcType="VARCHAR" property="shiftManNo" />
     <result column="SHIFT_MAN_NAME" jdbcType="VARCHAR" property="shiftManName" />
-    <result column="WORK_START_TIME" jdbcType="TIMESTAMP" property="workStartTime" />
-    <result column="WORK_END_TIME" jdbcType="TIMESTAMP" property="workEndTime" />
-    <result column="WORK_MATTERS" jdbcType="VARCHAR" property="workMatters" />
-    <result column="WORK_PROCESSING_RESULT" jdbcType="VARCHAR" property="workProcessingResult" />
-    <result column="WORK_REPORTER_NO" jdbcType="VARCHAR" property="workReporterNo" />
-    <result column="WORK_REPORTER_NAME" jdbcType="VARCHAR" property="workReporterName" />
-    <result column="WORK_HANDLER_NO" jdbcType="VARCHAR" property="workHandlerNo" />
-    <result column="WORK_HANDLER_NAME" jdbcType="VARCHAR" property="workHandlerName" />
     <result column="WORK_RECORDER_NO" jdbcType="VARCHAR" property="workRecorderNo" />
     <result column="WORK_RECORDER_NAME" jdbcType="VARCHAR" property="workRecorderName" />
     <result column="SHIFT_WORK_LOG" jdbcType="VARCHAR" property="shiftWorkLog" />
@@ -25,15 +17,13 @@
   </resultMap>
   <sql id="columns">
     SHIFT_REPORT_ID, CREATE_TIME, METER_CLASS, METER_GROUP, SHIFT_MAN_NO, SHIFT_MAN_NAME, 
-    WORK_START_TIME, WORK_END_TIME, WORK_MATTERS, WORK_PROCESSING_RESULT, WORK_REPORTER_NO, 
-    WORK_REPORTER_NAME, WORK_HANDLER_NO, WORK_HANDLER_NAME, WORK_RECORDER_NO, WORK_RECORDER_NAME, 
-    SHIFT_WORK_LOG, COMPARE_RECORDS, DEVICE_PROBLEM, WORK_LOG
+    WORK_RECORDER_NO, WORK_RECORDER_NAME, SHIFT_WORK_LOG, COMPARE_RECORDS, DEVICE_PROBLEM, 
+    WORK_LOG
   </sql>
   <sql id="columns_alias">
     t.SHIFT_REPORT_ID, t.CREATE_TIME, t.METER_CLASS, t.METER_GROUP, t.SHIFT_MAN_NO, t.SHIFT_MAN_NAME, 
-    t.WORK_START_TIME, t.WORK_END_TIME, t.WORK_MATTERS, t.WORK_PROCESSING_RESULT, t.WORK_REPORTER_NO, 
-    t.WORK_REPORTER_NAME, t.WORK_HANDLER_NO, t.WORK_HANDLER_NAME, t.WORK_RECORDER_NO, 
-    t.WORK_RECORDER_NAME, t.SHIFT_WORK_LOG, t.COMPARE_RECORDS, t.DEVICE_PROBLEM, t.WORK_LOG
+    t.WORK_RECORDER_NO, t.WORK_RECORDER_NAME, t.SHIFT_WORK_LOG, t.COMPARE_RECORDS, t.DEVICE_PROBLEM, 
+    t.WORK_LOG
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_WORK_SHIFT_REPORT
@@ -61,30 +51,6 @@
       <if test="shiftManName != null and shiftManName != ''">
         and SHIFT_MAN_NAME = #{shiftManName}
       </if>
-      <if test="workStartTime != null">
-        and TO_CHAR(WORK_START_TIME,'yyyy-MM-dd') = #{workStartTime}
-      </if>
-      <if test="workEndTime != null">
-        and TO_CHAR(WORK_END_TIME,'yyyy-MM-dd') = #{workEndTime}
-      </if>
-      <if test="workMatters != null and workMatters != ''">
-        and WORK_MATTERS = #{workMatters}
-      </if>
-      <if test="workProcessingResult != null and workProcessingResult != ''">
-        and WORK_PROCESSING_RESULT = #{workProcessingResult}
-      </if>
-      <if test="workReporterNo != null and workReporterNo != ''">
-        and WORK_REPORTER_NO = #{workReporterNo}
-      </if>
-      <if test="workReporterName != null and workReporterName != ''">
-        and WORK_REPORTER_NAME = #{workReporterName}
-      </if>
-      <if test="workHandlerNo != null and workHandlerNo != ''">
-        and WORK_HANDLER_NO = #{workHandlerNo}
-      </if>
-      <if test="workHandlerName != null and workHandlerName != ''">
-        and WORK_HANDLER_NAME = #{workHandlerName}
-      </if>
       <if test="workRecorderNo != null and workRecorderNo != ''">
         and WORK_RECORDER_NO = #{workRecorderNo}
       </if>
@@ -125,30 +91,6 @@
       <if test="shiftManName != null and shiftManName != ''">
         and SHIFT_MAN_NAME LIKE '%${shiftManName}%'
       </if>
-      <if test="workStartTime != null">
-        and TO_CHAR(WORK_START_TIME,'yyyy-MM-dd') = #{workStartTime}
-      </if>
-      <if test="workEndTime != null">
-        and TO_CHAR(WORK_END_TIME,'yyyy-MM-dd') = #{workEndTime}
-      </if>
-      <if test="workMatters != null and workMatters != ''">
-        and WORK_MATTERS LIKE '%${workMatters}%'
-      </if>
-      <if test="workProcessingResult != null and workProcessingResult != ''">
-        and WORK_PROCESSING_RESULT LIKE '%${workProcessingResult}%'
-      </if>
-      <if test="workReporterNo != null and workReporterNo != ''">
-        and WORK_REPORTER_NO LIKE '%${workReporterNo}%'
-      </if>
-      <if test="workReporterName != null and workReporterName != ''">
-        and WORK_REPORTER_NAME LIKE '%${workReporterName}%'
-      </if>
-      <if test="workHandlerNo != null and workHandlerNo != ''">
-        and WORK_HANDLER_NO LIKE '%${workHandlerNo}%'
-      </if>
-      <if test="workHandlerName != null and workHandlerName != ''">
-        and WORK_HANDLER_NAME LIKE '%${workHandlerName}%'
-      </if>
       <if test="workRecorderNo != null and workRecorderNo != ''">
         and WORK_RECORDER_NO LIKE '%${workRecorderNo}%'
       </if>
@@ -191,30 +133,6 @@
       <if test="shiftManName != null and shiftManName != ''">
         or SHIFT_MAN_NAME = #{shiftManName}
       </if>
-      <if test="workStartTime != null">
-        or TO_CHAR(WORK_START_TIME,'yyyy-MM-dd') = '#{workStartTime}'
-      </if>
-      <if test="workEndTime != null">
-        or TO_CHAR(WORK_END_TIME,'yyyy-MM-dd') = '#{workEndTime}'
-      </if>
-      <if test="workMatters != null and workMatters != ''">
-        or WORK_MATTERS = #{workMatters}
-      </if>
-      <if test="workProcessingResult != null and workProcessingResult != ''">
-        or WORK_PROCESSING_RESULT = #{workProcessingResult}
-      </if>
-      <if test="workReporterNo != null and workReporterNo != ''">
-        or WORK_REPORTER_NO = #{workReporterNo}
-      </if>
-      <if test="workReporterName != null and workReporterName != ''">
-        or WORK_REPORTER_NAME = #{workReporterName}
-      </if>
-      <if test="workHandlerNo != null and workHandlerNo != ''">
-        or WORK_HANDLER_NO = #{workHandlerNo}
-      </if>
-      <if test="workHandlerName != null and workHandlerName != ''">
-        or WORK_HANDLER_NAME = #{workHandlerName}
-      </if>
       <if test="workRecorderNo != null and workRecorderNo != ''">
         or WORK_RECORDER_NO = #{workRecorderNo}
       </if>
@@ -237,18 +155,14 @@
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport">
     insert into METER_WORK_SHIFT_REPORT (SHIFT_REPORT_ID, CREATE_TIME, METER_CLASS, 
       METER_GROUP, SHIFT_MAN_NO, SHIFT_MAN_NAME, 
-      WORK_START_TIME, WORK_END_TIME, WORK_MATTERS, 
-      WORK_PROCESSING_RESULT, WORK_REPORTER_NO, WORK_REPORTER_NAME, 
-      WORK_HANDLER_NO, WORK_HANDLER_NAME, WORK_RECORDER_NO, 
-      WORK_RECORDER_NAME, SHIFT_WORK_LOG, COMPARE_RECORDS, 
-      DEVICE_PROBLEM, WORK_LOG)
+      WORK_RECORDER_NO, WORK_RECORDER_NAME, SHIFT_WORK_LOG, 
+      COMPARE_RECORDS, DEVICE_PROBLEM, WORK_LOG
+      )
     values (#{shiftReportId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{meterClass,jdbcType=VARCHAR}, 
       #{meterGroup,jdbcType=VARCHAR}, #{shiftManNo,jdbcType=VARCHAR}, #{shiftManName,jdbcType=VARCHAR}, 
-      #{workStartTime,jdbcType=TIMESTAMP}, #{workEndTime,jdbcType=TIMESTAMP}, #{workMatters,jdbcType=VARCHAR}, 
-      #{workProcessingResult,jdbcType=VARCHAR}, #{workReporterNo,jdbcType=VARCHAR}, #{workReporterName,jdbcType=VARCHAR}, 
-      #{workHandlerNo,jdbcType=VARCHAR}, #{workHandlerName,jdbcType=VARCHAR}, #{workRecorderNo,jdbcType=VARCHAR}, 
-      #{workRecorderName,jdbcType=VARCHAR}, #{shiftWorkLog,jdbcType=VARCHAR}, #{compareRecords,jdbcType=VARCHAR}, 
-      #{deviceProblem,jdbcType=VARCHAR}, #{workLog,jdbcType=VARCHAR})
+      #{workRecorderNo,jdbcType=VARCHAR}, #{workRecorderName,jdbcType=VARCHAR}, #{shiftWorkLog,jdbcType=VARCHAR}, 
+      #{compareRecords,jdbcType=VARCHAR}, #{deviceProblem,jdbcType=VARCHAR}, #{workLog,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport">
     insert into METER_WORK_SHIFT_REPORT
@@ -271,30 +185,6 @@
       <if test="shiftManName != null">
         SHIFT_MAN_NAME,
       </if>
-      <if test="workStartTime != null">
-        WORK_START_TIME,
-      </if>
-      <if test="workEndTime != null">
-        WORK_END_TIME,
-      </if>
-      <if test="workMatters != null">
-        WORK_MATTERS,
-      </if>
-      <if test="workProcessingResult != null">
-        WORK_PROCESSING_RESULT,
-      </if>
-      <if test="workReporterNo != null">
-        WORK_REPORTER_NO,
-      </if>
-      <if test="workReporterName != null">
-        WORK_REPORTER_NAME,
-      </if>
-      <if test="workHandlerNo != null">
-        WORK_HANDLER_NO,
-      </if>
-      <if test="workHandlerName != null">
-        WORK_HANDLER_NAME,
-      </if>
       <if test="workRecorderNo != null">
         WORK_RECORDER_NO,
       </if>
@@ -333,30 +223,6 @@
       <if test="shiftManName != null">
         #{shiftManName,jdbcType=VARCHAR},
       </if>
-      <if test="workStartTime != null">
-        #{workStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="workEndTime != null">
-        #{workEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="workMatters != null">
-        #{workMatters,jdbcType=VARCHAR},
-      </if>
-      <if test="workProcessingResult != null">
-        #{workProcessingResult,jdbcType=VARCHAR},
-      </if>
-      <if test="workReporterNo != null">
-        #{workReporterNo,jdbcType=VARCHAR},
-      </if>
-      <if test="workReporterName != null">
-        #{workReporterName,jdbcType=VARCHAR},
-      </if>
-      <if test="workHandlerNo != null">
-        #{workHandlerNo,jdbcType=VARCHAR},
-      </if>
-      <if test="workHandlerName != null">
-        #{workHandlerName,jdbcType=VARCHAR},
-      </if>
       <if test="workRecorderNo != null">
         #{workRecorderNo,jdbcType=VARCHAR},
       </if>
@@ -384,14 +250,6 @@
       METER_GROUP = #{meterGroup,jdbcType=VARCHAR},
       SHIFT_MAN_NO = #{shiftManNo,jdbcType=VARCHAR},
       SHIFT_MAN_NAME = #{shiftManName,jdbcType=VARCHAR},
-      WORK_START_TIME = #{workStartTime,jdbcType=TIMESTAMP},
-      WORK_END_TIME = #{workEndTime,jdbcType=TIMESTAMP},
-      WORK_MATTERS = #{workMatters,jdbcType=VARCHAR},
-      WORK_PROCESSING_RESULT = #{workProcessingResult,jdbcType=VARCHAR},
-      WORK_REPORTER_NO = #{workReporterNo,jdbcType=VARCHAR},
-      WORK_REPORTER_NAME = #{workReporterName,jdbcType=VARCHAR},
-      WORK_HANDLER_NO = #{workHandlerNo,jdbcType=VARCHAR},
-      WORK_HANDLER_NAME = #{workHandlerName,jdbcType=VARCHAR},
       WORK_RECORDER_NO = #{workRecorderNo,jdbcType=VARCHAR},
       WORK_RECORDER_NAME = #{workRecorderName,jdbcType=VARCHAR},
       SHIFT_WORK_LOG = #{shiftWorkLog,jdbcType=VARCHAR},
@@ -418,30 +276,6 @@
       <if test="shiftManName != null">
         SHIFT_MAN_NAME = #{shiftManName,jdbcType=VARCHAR},
       </if>
-      <if test="workStartTime != null">
-        WORK_START_TIME = #{workStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="workEndTime != null">
-        WORK_END_TIME = #{workEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="workMatters != null">
-        WORK_MATTERS = #{workMatters,jdbcType=VARCHAR},
-      </if>
-      <if test="workProcessingResult != null">
-        WORK_PROCESSING_RESULT = #{workProcessingResult,jdbcType=VARCHAR},
-      </if>
-      <if test="workReporterNo != null">
-        WORK_REPORTER_NO = #{workReporterNo,jdbcType=VARCHAR},
-      </if>
-      <if test="workReporterName != null">
-        WORK_REPORTER_NAME = #{workReporterName,jdbcType=VARCHAR},
-      </if>
-      <if test="workHandlerNo != null">
-        WORK_HANDLER_NO = #{workHandlerNo,jdbcType=VARCHAR},
-      </if>
-      <if test="workHandlerName != null">
-        WORK_HANDLER_NAME = #{workHandlerName,jdbcType=VARCHAR},
-      </if>
       <if test="workRecorderNo != null">
         WORK_RECORDER_NO = #{workRecorderNo,jdbcType=VARCHAR},
       </if>
@@ -479,24 +313,18 @@
     insert into METER_WORK_SHIFT_REPORT 
       (SHIFT_REPORT_ID, 
       CREATE_TIME, METER_CLASS, METER_GROUP, 
-      SHIFT_MAN_NO, SHIFT_MAN_NAME, WORK_START_TIME, 
-      WORK_END_TIME, WORK_MATTERS, WORK_PROCESSING_RESULT, 
-      WORK_REPORTER_NO, WORK_REPORTER_NAME, 
-      WORK_HANDLER_NO, WORK_HANDLER_NAME, 
-      WORK_RECORDER_NO, WORK_RECORDER_NAME, 
-      SHIFT_WORK_LOG, COMPARE_RECORDS, 
-      DEVICE_PROBLEM, WORK_LOG)
+      SHIFT_MAN_NO, SHIFT_MAN_NAME, WORK_RECORDER_NO, 
+      WORK_RECORDER_NAME, SHIFT_WORK_LOG, 
+      COMPARE_RECORDS, DEVICE_PROBLEM, 
+      WORK_LOG)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.shiftReportId,jdbcType=VARCHAR}, 
       #{item.createTime,jdbcType=TIMESTAMP}, #{item.meterClass,jdbcType=VARCHAR}, #{item.meterGroup,jdbcType=VARCHAR}, 
-      #{item.shiftManNo,jdbcType=VARCHAR}, #{item.shiftManName,jdbcType=VARCHAR}, #{item.workStartTime,jdbcType=TIMESTAMP}, 
-      #{item.workEndTime,jdbcType=TIMESTAMP}, #{item.workMatters,jdbcType=VARCHAR}, #{item.workProcessingResult,jdbcType=VARCHAR}, 
-      #{item.workReporterNo,jdbcType=VARCHAR}, #{item.workReporterName,jdbcType=VARCHAR}, 
-      #{item.workHandlerNo,jdbcType=VARCHAR}, #{item.workHandlerName,jdbcType=VARCHAR}, 
-      #{item.workRecorderNo,jdbcType=VARCHAR}, #{item.workRecorderName,jdbcType=VARCHAR}, 
-      #{item.shiftWorkLog,jdbcType=VARCHAR}, #{item.compareRecords,jdbcType=VARCHAR}, 
-      #{item.deviceProblem,jdbcType=VARCHAR}, #{item.workLog,jdbcType=VARCHAR} from dual  
+      #{item.shiftManNo,jdbcType=VARCHAR}, #{item.shiftManName,jdbcType=VARCHAR}, #{item.workRecorderNo,jdbcType=VARCHAR}, 
+      #{item.workRecorderName,jdbcType=VARCHAR}, #{item.shiftWorkLog,jdbcType=VARCHAR}, 
+      #{item.compareRecords,jdbcType=VARCHAR}, #{item.deviceProblem,jdbcType=VARCHAR}, 
+      #{item.workLog,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -526,38 +354,6 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
           when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.shiftManName,jdbcType=VARCHAR}
        </foreach>
-       ,WORK_START_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
-          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workStartTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,WORK_END_TIME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
-          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workEndTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,WORK_MATTERS=
-       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
-          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workMatters,jdbcType=VARCHAR}
-       </foreach>
-       ,WORK_PROCESSING_RESULT=
-       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
-          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workProcessingResult,jdbcType=VARCHAR}
-       </foreach>
-       ,WORK_REPORTER_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
-          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workReporterNo,jdbcType=VARCHAR}
-       </foreach>
-       ,WORK_REPORTER_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
-          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workReporterName,jdbcType=VARCHAR}
-       </foreach>
-       ,WORK_HANDLER_NO=
-       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
-          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workHandlerNo,jdbcType=VARCHAR}
-       </foreach>
-       ,WORK_HANDLER_NAME=
-       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
-          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workHandlerName,jdbcType=VARCHAR}
-       </foreach>
        ,WORK_RECORDER_NO=
        <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
           when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workRecorderNo,jdbcType=VARCHAR}
@@ -599,7 +395,6 @@
   <select id="likeByCreateTime" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select" />
     where 1 = 1
-        and rownum = 1
     <if test="createTime != null">
       and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
     </if>

src/main/java/com/steerinfo/meterwork/meterworkshiftreport/model/MeterWorkShiftReport.java

@@ -44,54 +44,6 @@ public class MeterWorkShiftReport implements IBasePO<String> {
     @ApiModelProperty(value="交班人",required=false)
     private String shiftManName;
 
-    /**
-     * 工作日志开始时间(WORK_START_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="工作日志开始时间",required=false)
-    private Date workStartTime;
-
-    /**
-     * 工作日志完成时间(WORK_END_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="工作日志完成时间",required=false)
-    private Date workEndTime;
-
-    /**
-     * 工作事项(WORK_MATTERS,VARCHAR,255)
-     */
-    @ApiModelProperty(value="工作事项",required=false)
-    private String workMatters;
-
-    /**
-     * 工作处理结果(WORK_PROCESSING_RESULT,VARCHAR,500)
-     */
-    @ApiModelProperty(value="工作处理结果",required=false)
-    private String workProcessingResult;
-
-    /**
-     * 工作汇报人编号(WORK_REPORTER_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="工作汇报人编号",required=false)
-    private String workReporterNo;
-
-    /**
-     * 工作汇报人(WORK_REPORTER_NAME,VARCHAR,50)
-     */
-    @ApiModelProperty(value="工作汇报人",required=false)
-    private String workReporterName;
-
-    /**
-     * 工作处理人编号(WORK_HANDLER_NO,VARCHAR,20)
-     */
-    @ApiModelProperty(value="工作处理人编号",required=false)
-    private String workHandlerNo;
-
-    /**
-     * 工作处理人(WORK_HANDLER_NAME,VARCHAR,50)
-     */
-    @ApiModelProperty(value="工作处理人",required=false)
-    private String workHandlerName;
-
     /**
      * 工作记录人编号(WORK_RECORDER_NO,VARCHAR,20)
      */
@@ -188,70 +140,6 @@ public class MeterWorkShiftReport implements IBasePO<String> {
         this.shiftManName = shiftManName == null ? null : shiftManName.trim();
     }
 
-    public Date getWorkStartTime() {
-        return workStartTime;
-    }
-
-    public void setWorkStartTime(Date workStartTime) {
-        this.workStartTime = workStartTime;
-    }
-
-    public Date getWorkEndTime() {
-        return workEndTime;
-    }
-
-    public void setWorkEndTime(Date workEndTime) {
-        this.workEndTime = workEndTime;
-    }
-
-    public String getWorkMatters() {
-        return workMatters;
-    }
-
-    public void setWorkMatters(String workMatters) {
-        this.workMatters = workMatters == null ? null : workMatters.trim();
-    }
-
-    public String getWorkProcessingResult() {
-        return workProcessingResult;
-    }
-
-    public void setWorkProcessingResult(String workProcessingResult) {
-        this.workProcessingResult = workProcessingResult == null ? null : workProcessingResult.trim();
-    }
-
-    public String getWorkReporterNo() {
-        return workReporterNo;
-    }
-
-    public void setWorkReporterNo(String workReporterNo) {
-        this.workReporterNo = workReporterNo == null ? null : workReporterNo.trim();
-    }
-
-    public String getWorkReporterName() {
-        return workReporterName;
-    }
-
-    public void setWorkReporterName(String workReporterName) {
-        this.workReporterName = workReporterName == null ? null : workReporterName.trim();
-    }
-
-    public String getWorkHandlerNo() {
-        return workHandlerNo;
-    }
-
-    public void setWorkHandlerNo(String workHandlerNo) {
-        this.workHandlerNo = workHandlerNo == null ? null : workHandlerNo.trim();
-    }
-
-    public String getWorkHandlerName() {
-        return workHandlerName;
-    }
-
-    public void setWorkHandlerName(String workHandlerName) {
-        this.workHandlerName = workHandlerName == null ? null : workHandlerName.trim();
-    }
-
     public String getWorkRecorderNo() {
         return workRecorderNo;
     }
@@ -312,14 +200,6 @@ public class MeterWorkShiftReport implements IBasePO<String> {
         sb.append(", meterGroup=").append(meterGroup);
         sb.append(", shiftManNo=").append(shiftManNo);
         sb.append(", shiftManName=").append(shiftManName);
-        sb.append(", workStartTime=").append(workStartTime);
-        sb.append(", workEndTime=").append(workEndTime);
-        sb.append(", workMatters=").append(workMatters);
-        sb.append(", workProcessingResult=").append(workProcessingResult);
-        sb.append(", workReporterNo=").append(workReporterNo);
-        sb.append(", workReporterName=").append(workReporterName);
-        sb.append(", workHandlerNo=").append(workHandlerNo);
-        sb.append(", workHandlerName=").append(workHandlerName);
         sb.append(", workRecorderNo=").append(workRecorderNo);
         sb.append(", workRecorderName=").append(workRecorderName);
         sb.append(", shiftWorkLog=").append(shiftWorkLog);

src/main/java/com/steerinfo/meterwork/meterworkshiftreport/service/IMeterWorkShiftReportService.java

@@ -1,9 +1,11 @@
 package com.steerinfo.meterwork.meterworkshiftreport.service;
 
 import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport;
 
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterWorkShiftReport服务接口：
@@ -19,7 +21,7 @@ import java.util.HashMap;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface IMeterWorkShiftReportService extends IBaseService<MeterWorkShiftReport, String>{
-    MeterWorkShiftReport likeByCreateTime(HashMap<String, Object> params);
+    PageList<MeterWorkShiftReport> likeByCreateTime(HashMap<String, Object> params);
     MeterWorkShiftReport updateModel(MeterWorkShiftReport model);
     MeterWorkShiftReport addModel(MeterWorkShiftReport model);
 }

src/main/java/com/steerinfo/meterwork/meterworkshiftreport/service/impl/MeterWorkShiftReportServiceImpl.java

@@ -2,6 +2,8 @@ package com.steerinfo.meterwork.meterworkshiftreport.service.impl;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.user.UserPayload;
 import com.steerinfo.meterwork.meterworkshiftreport.mapper.MeterWorkShiftReportMapper;
 import com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport;
@@ -40,9 +42,11 @@ public class MeterWorkShiftReportServiceImpl extends BaseServiceImpl<MeterWorkSh
     }
 
     @Override
-    public MeterWorkShiftReport likeByCreateTime(HashMap<String, Object> params) {
-        MeterWorkShiftReport rows = meterWorkShiftReportMapper.likeByCreateTime(params);
-        return rows;
+    public PageList<MeterWorkShiftReport> likeByCreateTime(HashMap<String, Object> params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<MeterWorkShiftReport> rows = meterWorkShiftReportMapper.likeByCreateTime(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
     }
 
     @Override

src/main/java/com/steerinfo/meterwork/meterworkshiftreportgroup/controller/MeterWorkShiftReportGroupController.java

@@ -0,0 +1,128 @@
+package com.steerinfo.meterwork.meterworkshiftreportgroup.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport;
+import com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup;
+import com.steerinfo.meterwork.meterworkshiftreportgroup.service.IMeterWorkShiftReportGroupService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterWorkShiftReportGroup RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-16 03:10
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-16
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkShiftReportGroup RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterworkshiftreportgroups")
+public class MeterWorkShiftReportGroupController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterWorkShiftReportGroupService meterWorkShiftReportGroupService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkshiftreportgroup:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkShiftReportGroup> list = meterWorkShiftReportGroupService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkshiftreportgroup:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkShiftReportGroup> list = meterWorkShiftReportGroupService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterWorkShiftReportGroup对象创建")
+    @ApiImplicitParam(name = "meterWorkShiftReportGroup", value = "详细实体meterWorkShiftReportGroup", required = true, dataType = "MeterWorkShiftReportGroup")
+    //@RequiresPermissions("meterworkshiftreportgroup:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterWorkShiftReportGroup model){
+        MeterWorkShiftReportGroup meterWorkShiftReportGroup = meterWorkShiftReportGroupService.add(model);
+        return success(meterWorkShiftReportGroup);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkshiftreportgroup:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterWorkShiftReportGroup meterWorkShiftReportGroup = meterWorkShiftReportGroupService.getById(id);
+        return success(meterWorkShiftReportGroup);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkShiftReportGroup信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterWorkShiftReportGroup", value = "详细实体meterWorkShiftReportGroup", required = true, dataType = "MeterWorkShiftReportGroup")
+    })
+    //@RequiresPermissions("meterworkshiftreportgroup:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterWorkShiftReportGroup model){
+        model.setId(id);
+        MeterWorkShiftReportGroup meterWorkShiftReportGroup = meterWorkShiftReportGroupService.modify(model);
+        return success(meterWorkShiftReportGroup);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkshiftreportgroup:delete")
+    @DeleteMapping(value = "/{id}")//String
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<String> ids = ListUtils.convertList(list);
+			  meterWorkShiftReportGroupService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value="根据日期查询", notes="只能查询一条数据")
+    @PostMapping(value = "/likeByCreateTime")
+    public RESTfulResult likeByCreateTime(@RequestBody HashMap parmas){
+        PageList<MeterWorkShiftReportGroup> list = meterWorkShiftReportGroupService.likeByCreateTime(parmas);
+        return success(list);
+    }
+
+    @ApiOperation(value="修改数据配置", notes="修改数据配置")
+    @PostMapping(value = "/updateModel")
+    public RESTfulResult updateModel(@RequestBody MeterWorkShiftReportGroup model){
+        MeterWorkShiftReportGroup meterWorkShiftReport = meterWorkShiftReportGroupService.updateModel(model);
+        return success(meterWorkShiftReport);
+    }
+
+    @ApiOperation(value="新增数据配置", notes="新增数据配置")
+    @PostMapping(value = "/addModel")
+    public RESTfulResult addModel(@RequestBody MeterWorkShiftReportGroup model){
+        MeterWorkShiftReportGroup meterWorkShiftReport = meterWorkShiftReportGroupService.addModel(model);
+        return success(meterWorkShiftReport);
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkshiftreportgroup/mapper/MeterWorkShiftReportGroupMapper.java

@@ -0,0 +1,14 @@
+package com.steerinfo.meterwork.meterworkshiftreportgroup.mapper;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport;
+import com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Mapper
+public interface MeterWorkShiftReportGroupMapper extends IBaseMapper<MeterWorkShiftReportGroup, String> {
+    List<MeterWorkShiftReportGroup> likeByCreateTime(HashMap<String, Object> params);
+}

src/main/java/com/steerinfo/meterwork/meterworkshiftreportgroup/mapper/MeterWorkShiftReportGroupMapper.xml

@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.meterwork.meterworkshiftreportgroup.mapper.MeterWorkShiftReportGroupMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup">
+    <id column="SHIFT_REPORT_ID" jdbcType="VARCHAR" property="shiftReportId" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="METER_CLASS" jdbcType="VARCHAR" property="meterClass" />
+    <result column="METER_GROUP" jdbcType="VARCHAR" property="meterGroup" />
+    <result column="SHIFT_MAN_NO" jdbcType="VARCHAR" property="shiftManNo" />
+    <result column="SHIFT_MAN_NAME" jdbcType="VARCHAR" property="shiftManName" />
+    <result column="WORK_RECORDER_NO" jdbcType="VARCHAR" property="workRecorderNo" />
+    <result column="WORK_RECORDER_NAME" jdbcType="VARCHAR" property="workRecorderName" />
+    <result column="SHIFT_WORK_LOG" jdbcType="VARCHAR" property="shiftWorkLog" />
+    <result column="COMPARE_RECORDS" jdbcType="VARCHAR" property="compareRecords" />
+    <result column="DEVICE_PROBLEM" jdbcType="VARCHAR" property="deviceProblem" />
+    <result column="WORK_LOG" jdbcType="VARCHAR" property="workLog" />
+  </resultMap>
+  <sql id="columns">
+    SHIFT_REPORT_ID, CREATE_TIME, METER_CLASS, METER_GROUP, SHIFT_MAN_NO, SHIFT_MAN_NAME, 
+    WORK_RECORDER_NO, WORK_RECORDER_NAME, SHIFT_WORK_LOG, COMPARE_RECORDS, DEVICE_PROBLEM, 
+    WORK_LOG
+  </sql>
+  <sql id="columns_alias">
+    t.SHIFT_REPORT_ID, t.CREATE_TIME, t.METER_CLASS, t.METER_GROUP, t.SHIFT_MAN_NO, t.SHIFT_MAN_NAME, 
+    t.WORK_RECORDER_NO, t.WORK_RECORDER_NAME, t.SHIFT_WORK_LOG, t.COMPARE_RECORDS, t.DEVICE_PROBLEM, 
+    t.WORK_LOG
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_WORK_SHIFT_REPORT_GROUP
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_SHIFT_REPORT_GROUP t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="shiftReportId != null and shiftReportId != ''">
+        and SHIFT_REPORT_ID = #{shiftReportId}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="meterClass != null and meterClass != ''">
+        and METER_CLASS = #{meterClass}
+      </if>
+      <if test="meterGroup != null and meterGroup != ''">
+        and METER_GROUP = #{meterGroup}
+      </if>
+      <if test="shiftManNo != null and shiftManNo != ''">
+        and SHIFT_MAN_NO = #{shiftManNo}
+      </if>
+      <if test="shiftManName != null and shiftManName != ''">
+        and SHIFT_MAN_NAME = #{shiftManName}
+      </if>
+      <if test="workRecorderNo != null and workRecorderNo != ''">
+        and WORK_RECORDER_NO = #{workRecorderNo}
+      </if>
+      <if test="workRecorderName != null and workRecorderName != ''">
+        and WORK_RECORDER_NAME = #{workRecorderName}
+      </if>
+      <if test="shiftWorkLog != null and shiftWorkLog != ''">
+        and SHIFT_WORK_LOG = #{shiftWorkLog}
+      </if>
+      <if test="compareRecords != null and compareRecords != ''">
+        and COMPARE_RECORDS = #{compareRecords}
+      </if>
+      <if test="deviceProblem != null and deviceProblem != ''">
+        and DEVICE_PROBLEM = #{deviceProblem}
+      </if>
+      <if test="workLog != null and workLog != ''">
+        and WORK_LOG = #{workLog}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="shiftReportId != null and shiftReportId != ''">
+        and SHIFT_REPORT_ID LIKE '%${shiftReportId}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="meterClass != null and meterClass != ''">
+        and METER_CLASS LIKE '%${meterClass}%'
+      </if>
+      <if test="meterGroup != null and meterGroup != ''">
+        and METER_GROUP LIKE '%${meterGroup}%'
+      </if>
+      <if test="shiftManNo != null and shiftManNo != ''">
+        and SHIFT_MAN_NO LIKE '%${shiftManNo}%'
+      </if>
+      <if test="shiftManName != null and shiftManName != ''">
+        and SHIFT_MAN_NAME LIKE '%${shiftManName}%'
+      </if>
+      <if test="workRecorderNo != null and workRecorderNo != ''">
+        and WORK_RECORDER_NO LIKE '%${workRecorderNo}%'
+      </if>
+      <if test="workRecorderName != null and workRecorderName != ''">
+        and WORK_RECORDER_NAME LIKE '%${workRecorderName}%'
+      </if>
+      <if test="shiftWorkLog != null and shiftWorkLog != ''">
+        and SHIFT_WORK_LOG LIKE '%${shiftWorkLog}%'
+      </if>
+      <if test="compareRecords != null and compareRecords != ''">
+        and COMPARE_RECORDS LIKE '%${compareRecords}%'
+      </if>
+      <if test="deviceProblem != null and deviceProblem != ''">
+        and DEVICE_PROBLEM LIKE '%${deviceProblem}%'
+      </if>
+      <if test="workLog != null and workLog != ''">
+        and WORK_LOG LIKE '%${workLog}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_SHIFT_REPORT_GROUP
+    where SHIFT_REPORT_ID = #{shiftReportId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_SHIFT_REPORT_GROUP
+    where 1!=1 
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="meterClass != null and meterClass != ''">
+        or METER_CLASS = #{meterClass}
+      </if>
+      <if test="meterGroup != null and meterGroup != ''">
+        or METER_GROUP = #{meterGroup}
+      </if>
+      <if test="shiftManNo != null and shiftManNo != ''">
+        or SHIFT_MAN_NO = #{shiftManNo}
+      </if>
+      <if test="shiftManName != null and shiftManName != ''">
+        or SHIFT_MAN_NAME = #{shiftManName}
+      </if>
+      <if test="workRecorderNo != null and workRecorderNo != ''">
+        or WORK_RECORDER_NO = #{workRecorderNo}
+      </if>
+      <if test="workRecorderName != null and workRecorderName != ''">
+        or WORK_RECORDER_NAME = #{workRecorderName}
+      </if>
+      <if test="shiftWorkLog != null and shiftWorkLog != ''">
+        or SHIFT_WORK_LOG = #{shiftWorkLog}
+      </if>
+      <if test="compareRecords != null and compareRecords != ''">
+        or COMPARE_RECORDS = #{compareRecords}
+      </if>
+      <if test="deviceProblem != null and deviceProblem != ''">
+        or DEVICE_PROBLEM = #{deviceProblem}
+      </if>
+      <if test="workLog != null and workLog != ''">
+        or WORK_LOG = #{workLog}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup">
+    insert into METER_WORK_SHIFT_REPORT_GROUP (SHIFT_REPORT_ID, CREATE_TIME, METER_CLASS, 
+      METER_GROUP, SHIFT_MAN_NO, SHIFT_MAN_NAME, 
+      WORK_RECORDER_NO, WORK_RECORDER_NAME, SHIFT_WORK_LOG, 
+      COMPARE_RECORDS, DEVICE_PROBLEM, WORK_LOG
+      )
+    values (#{shiftReportId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{meterClass,jdbcType=VARCHAR}, 
+      #{meterGroup,jdbcType=VARCHAR}, #{shiftManNo,jdbcType=VARCHAR}, #{shiftManName,jdbcType=VARCHAR}, 
+      #{workRecorderNo,jdbcType=VARCHAR}, #{workRecorderName,jdbcType=VARCHAR}, #{shiftWorkLog,jdbcType=VARCHAR}, 
+      #{compareRecords,jdbcType=VARCHAR}, #{deviceProblem,jdbcType=VARCHAR}, #{workLog,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup">
+    insert into METER_WORK_SHIFT_REPORT_GROUP
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="shiftReportId != null">
+        SHIFT_REPORT_ID,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="meterClass != null">
+        METER_CLASS,
+      </if>
+      <if test="meterGroup != null">
+        METER_GROUP,
+      </if>
+      <if test="shiftManNo != null">
+        SHIFT_MAN_NO,
+      </if>
+      <if test="shiftManName != null">
+        SHIFT_MAN_NAME,
+      </if>
+      <if test="workRecorderNo != null">
+        WORK_RECORDER_NO,
+      </if>
+      <if test="workRecorderName != null">
+        WORK_RECORDER_NAME,
+      </if>
+      <if test="shiftWorkLog != null">
+        SHIFT_WORK_LOG,
+      </if>
+      <if test="compareRecords != null">
+        COMPARE_RECORDS,
+      </if>
+      <if test="deviceProblem != null">
+        DEVICE_PROBLEM,
+      </if>
+      <if test="workLog != null">
+        WORK_LOG,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="shiftReportId != null">
+        #{shiftReportId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="meterClass != null">
+        #{meterClass,jdbcType=VARCHAR},
+      </if>
+      <if test="meterGroup != null">
+        #{meterGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftManNo != null">
+        #{shiftManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftManName != null">
+        #{shiftManName,jdbcType=VARCHAR},
+      </if>
+      <if test="workRecorderNo != null">
+        #{workRecorderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="workRecorderName != null">
+        #{workRecorderName,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftWorkLog != null">
+        #{shiftWorkLog,jdbcType=VARCHAR},
+      </if>
+      <if test="compareRecords != null">
+        #{compareRecords,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceProblem != null">
+        #{deviceProblem,jdbcType=VARCHAR},
+      </if>
+      <if test="workLog != null">
+        #{workLog,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup">
+    update METER_WORK_SHIFT_REPORT_GROUP
+    set CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      METER_CLASS = #{meterClass,jdbcType=VARCHAR},
+      METER_GROUP = #{meterGroup,jdbcType=VARCHAR},
+      SHIFT_MAN_NO = #{shiftManNo,jdbcType=VARCHAR},
+      SHIFT_MAN_NAME = #{shiftManName,jdbcType=VARCHAR},
+      WORK_RECORDER_NO = #{workRecorderNo,jdbcType=VARCHAR},
+      WORK_RECORDER_NAME = #{workRecorderName,jdbcType=VARCHAR},
+      SHIFT_WORK_LOG = #{shiftWorkLog,jdbcType=VARCHAR},
+      COMPARE_RECORDS = #{compareRecords,jdbcType=VARCHAR},
+      DEVICE_PROBLEM = #{deviceProblem,jdbcType=VARCHAR},
+      WORK_LOG = #{workLog,jdbcType=VARCHAR}
+    where SHIFT_REPORT_ID = #{shiftReportId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup">
+    update METER_WORK_SHIFT_REPORT_GROUP
+    <set>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="meterClass != null">
+        METER_CLASS = #{meterClass,jdbcType=VARCHAR},
+      </if>
+      <if test="meterGroup != null">
+        METER_GROUP = #{meterGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftManNo != null">
+        SHIFT_MAN_NO = #{shiftManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftManName != null">
+        SHIFT_MAN_NAME = #{shiftManName,jdbcType=VARCHAR},
+      </if>
+      <if test="workRecorderNo != null">
+        WORK_RECORDER_NO = #{workRecorderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="workRecorderName != null">
+        WORK_RECORDER_NAME = #{workRecorderName,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftWorkLog != null">
+        SHIFT_WORK_LOG = #{shiftWorkLog,jdbcType=VARCHAR},
+      </if>
+      <if test="compareRecords != null">
+        COMPARE_RECORDS = #{compareRecords,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceProblem != null">
+        DEVICE_PROBLEM = #{deviceProblem,jdbcType=VARCHAR},
+      </if>
+      <if test="workLog != null">
+        WORK_LOG = #{workLog,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where SHIFT_REPORT_ID = #{shiftReportId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where SHIFT_REPORT_ID = #{shiftReportId,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_WORK_SHIFT_REPORT_GROUP 
+      (SHIFT_REPORT_ID, 
+      CREATE_TIME, METER_CLASS, METER_GROUP, 
+      SHIFT_MAN_NO, SHIFT_MAN_NAME, WORK_RECORDER_NO, 
+      WORK_RECORDER_NAME, SHIFT_WORK_LOG, 
+      COMPARE_RECORDS, DEVICE_PROBLEM, 
+      WORK_LOG)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.shiftReportId,jdbcType=VARCHAR}, 
+      #{item.createTime,jdbcType=TIMESTAMP}, #{item.meterClass,jdbcType=VARCHAR}, #{item.meterGroup,jdbcType=VARCHAR}, 
+      #{item.shiftManNo,jdbcType=VARCHAR}, #{item.shiftManName,jdbcType=VARCHAR}, #{item.workRecorderNo,jdbcType=VARCHAR}, 
+      #{item.workRecorderName,jdbcType=VARCHAR}, #{item.shiftWorkLog,jdbcType=VARCHAR}, 
+      #{item.compareRecords,jdbcType=VARCHAR}, #{item.deviceProblem,jdbcType=VARCHAR}, 
+      #{item.workLog,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_SHIFT_REPORT_GROUP
+     set
+       SHIFT_REPORT_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.shiftReportId,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,METER_CLASS=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.meterClass,jdbcType=VARCHAR}
+       </foreach>
+       ,METER_GROUP=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.meterGroup,jdbcType=VARCHAR}
+       </foreach>
+       ,SHIFT_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.shiftManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,SHIFT_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.shiftManName,jdbcType=VARCHAR}
+       </foreach>
+       ,WORK_RECORDER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workRecorderNo,jdbcType=VARCHAR}
+       </foreach>
+       ,WORK_RECORDER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workRecorderName,jdbcType=VARCHAR}
+       </foreach>
+       ,SHIFT_WORK_LOG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.shiftWorkLog,jdbcType=VARCHAR}
+       </foreach>
+       ,COMPARE_RECORDS=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.compareRecords,jdbcType=VARCHAR}
+       </foreach>
+       ,DEVICE_PROBLEM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.deviceProblem,jdbcType=VARCHAR}
+       </foreach>
+       ,WORK_LOG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workLog,jdbcType=VARCHAR}
+       </foreach>
+     where SHIFT_REPORT_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.shiftReportId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_SHIFT_REPORT_GROUP
+    where SHIFT_REPORT_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="likeByCreateTime" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    where 1 = 1
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="meterClass != null and meterClass != ''">
+        and METER_CLASS LIKE '%${meterClass}%'
+      </if>
+      <if test="meterGroup != null and meterGroup != ''">
+        and METER_GROUP LIKE '%${meterGroup}%'
+      </if>
+      <if test="shiftManNo != null and shiftManNo != ''">
+        and SHIFT_MAN_NO LIKE '%${shiftManNo}%'
+      </if>
+      <if test="shiftManName != null and shiftManName != ''">
+        and SHIFT_MAN_NAME LIKE '%${shiftManName}%'
+      </if>
+  </select>
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkshiftreportgroup/model/MeterWorkShiftReportGroup.java

@@ -0,0 +1,213 @@
+package com.steerinfo.meterwork.meterworkshiftreportgroup.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+@ApiModel(value="计量班组交接班报表")
+public class MeterWorkShiftReportGroup implements IBasePO<String> {
+    /**
+     * 交接班主键(SHIFT_REPORT_ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="交接班主键",required=true)
+    private String shiftReportId;
+
+    /**
+     * 日期(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="日期",required=false)
+    private Date createTime;
+
+    /**
+     * 班次(METER_CLASS,VARCHAR,20)
+     */
+    @ApiModelProperty(value="班次",required=false)
+    private String meterClass;
+
+    /**
+     * 班组(METER_GROUP,VARCHAR,50)
+     */
+    @ApiModelProperty(value="班组",required=false)
+    private String meterGroup;
+
+    /**
+     * 交班人编号(SHIFT_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="交班人编号",required=false)
+    private String shiftManNo;
+
+    /**
+     * 交班人(SHIFT_MAN_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="交班人",required=false)
+    private String shiftManName;
+
+    /**
+     * 工作记录人编号(WORK_RECORDER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="工作记录人编号",required=false)
+    private String workRecorderNo;
+
+    /**
+     * 工作记录人(WORK_RECORDER_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="工作记录人",required=false)
+    private String workRecorderName;
+
+    /**
+     * 故障处理、状态维修、保养(SHIFT_WORK_LOG,VARCHAR,500)
+     */
+    @ApiModelProperty(value="故障处理、状态维修、保养",required=false)
+    private String shiftWorkLog;
+
+    /**
+     * 衡器检定、校准(COMPARE_RECORDS,VARCHAR,500)
+     */
+    @ApiModelProperty(value="衡器检定、校准",required=false)
+    private String compareRecords;
+
+    /**
+     * 加班人员(DEVICE_PROBLEM,VARCHAR,500)
+     */
+    @ApiModelProperty(value="加班人员",required=false)
+    private String deviceProblem;
+
+    /**
+     * 工作日志(WORK_LOG,VARCHAR,500)
+     */
+    @ApiModelProperty(value="工作日志",required=false)
+    private String workLog;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.shiftReportId;
+    }
+
+    @Override
+    public void setId(String shiftReportId) {
+        this.shiftReportId = shiftReportId == null ? null : shiftReportId.trim();
+    }
+
+    public String getShiftReportId() {
+        return shiftReportId;
+    }
+
+    public void setShiftReportId(String shiftReportId) {
+        this.shiftReportId = shiftReportId == null ? null : shiftReportId.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getMeterClass() {
+        return meterClass;
+    }
+
+    public void setMeterClass(String meterClass) {
+        this.meterClass = meterClass == null ? null : meterClass.trim();
+    }
+
+    public String getMeterGroup() {
+        return meterGroup;
+    }
+
+    public void setMeterGroup(String meterGroup) {
+        this.meterGroup = meterGroup == null ? null : meterGroup.trim();
+    }
+
+    public String getShiftManNo() {
+        return shiftManNo;
+    }
+
+    public void setShiftManNo(String shiftManNo) {
+        this.shiftManNo = shiftManNo == null ? null : shiftManNo.trim();
+    }
+
+    public String getShiftManName() {
+        return shiftManName;
+    }
+
+    public void setShiftManName(String shiftManName) {
+        this.shiftManName = shiftManName == null ? null : shiftManName.trim();
+    }
+
+    public String getWorkRecorderNo() {
+        return workRecorderNo;
+    }
+
+    public void setWorkRecorderNo(String workRecorderNo) {
+        this.workRecorderNo = workRecorderNo == null ? null : workRecorderNo.trim();
+    }
+
+    public String getWorkRecorderName() {
+        return workRecorderName;
+    }
+
+    public void setWorkRecorderName(String workRecorderName) {
+        this.workRecorderName = workRecorderName == null ? null : workRecorderName.trim();
+    }
+
+    public String getShiftWorkLog() {
+        return shiftWorkLog;
+    }
+
+    public void setShiftWorkLog(String shiftWorkLog) {
+        this.shiftWorkLog = shiftWorkLog == null ? null : shiftWorkLog.trim();
+    }
+
+    public String getCompareRecords() {
+        return compareRecords;
+    }
+
+    public void setCompareRecords(String compareRecords) {
+        this.compareRecords = compareRecords == null ? null : compareRecords.trim();
+    }
+
+    public String getDeviceProblem() {
+        return deviceProblem;
+    }
+
+    public void setDeviceProblem(String deviceProblem) {
+        this.deviceProblem = deviceProblem == null ? null : deviceProblem.trim();
+    }
+
+    public String getWorkLog() {
+        return workLog;
+    }
+
+    public void setWorkLog(String workLog) {
+        this.workLog = workLog == null ? null : workLog.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", shiftReportId=").append(shiftReportId);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", meterClass=").append(meterClass);
+        sb.append(", meterGroup=").append(meterGroup);
+        sb.append(", shiftManNo=").append(shiftManNo);
+        sb.append(", shiftManName=").append(shiftManName);
+        sb.append(", workRecorderNo=").append(workRecorderNo);
+        sb.append(", workRecorderName=").append(workRecorderName);
+        sb.append(", shiftWorkLog=").append(shiftWorkLog);
+        sb.append(", compareRecords=").append(compareRecords);
+        sb.append(", deviceProblem=").append(deviceProblem);
+        sb.append(", workLog=").append(workLog);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkshiftreportgroup/service/IMeterWorkShiftReportGroupService.java

@@ -0,0 +1,28 @@
+package com.steerinfo.meterwork.meterworkshiftreportgroup.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport;
+import com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterWorkShiftReportGroup服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-16 03:10
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-16
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkShiftReportGroup服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterWorkShiftReportGroupService extends IBaseService<MeterWorkShiftReportGroup, String>{
+    PageList<MeterWorkShiftReportGroup> likeByCreateTime(HashMap<String, Object> params);
+    MeterWorkShiftReportGroup updateModel(MeterWorkShiftReportGroup model);
+    MeterWorkShiftReportGroup addModel(MeterWorkShiftReportGroup model);
+}

src/main/java/com/steerinfo/meterwork/meterworkshiftreportgroup/service/impl/MeterWorkShiftReportGroupServiceImpl.java

@@ -0,0 +1,93 @@
+package com.steerinfo.meterwork.meterworkshiftreportgroup.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.user.UserPayload;
+import com.steerinfo.meterwork.meterworkshiftreport.model.MeterWorkShiftReport;
+import com.steerinfo.meterwork.meterworkshiftreportgroup.mapper.MeterWorkShiftReportGroupMapper;
+import com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup;
+import com.steerinfo.meterwork.meterworkshiftreportgroup.service.IMeterWorkShiftReportGroupService;
+import com.steerinfo.util.PublicMethod;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterWorkShiftReportGroup服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-16 03:10
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-16
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkShiftReportGroup服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterWorkShiftReportGroupService")
+public class MeterWorkShiftReportGroupServiceImpl extends BaseServiceImpl<MeterWorkShiftReportGroup, String> implements IMeterWorkShiftReportGroupService {
+
+    @Resource
+    private MeterWorkShiftReportGroupMapper meterWorkShiftReportGroupMapper;
+
+    @Override
+    protected IBaseMapper<MeterWorkShiftReportGroup, String> getMapper() {
+        return meterWorkShiftReportGroupMapper;
+    }
+
+    @Override
+    public PageList<MeterWorkShiftReportGroup> likeByCreateTime(HashMap<String, Object> params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<MeterWorkShiftReportGroup> rows = meterWorkShiftReportGroupMapper.likeByCreateTime(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
+    @Override
+    public MeterWorkShiftReportGroup updateModel(MeterWorkShiftReportGroup model) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        sdf.format(model.getCreateTime());
+        String userId;
+        String userName;
+        try{
+            UserPayload payload = UserPayload.getCurrUser();
+            userId = payload.getUserCode();
+            userName = payload.getUserName();
+        }catch(Exception e) {
+            userId = "admin";
+            userName = "admins";
+        }
+        model.setWorkRecorderNo(userId);
+        model.setWorkRecorderName(userName);
+        meterWorkShiftReportGroupMapper.updateByPrimaryKeySelective(model);
+        return meterWorkShiftReportGroupMapper.selectByPrimaryKey(model.getShiftReportId());
+    }
+
+    @Override
+    public MeterWorkShiftReportGroup addModel(MeterWorkShiftReportGroup model) {
+        model.setShiftReportId(PublicMethod.IdCreate(3));
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        sdf.format(model.getCreateTime());
+        String userId;
+        String userName;
+        try{
+            UserPayload payload = UserPayload.getCurrUser();
+            userId = payload.getUserCode();
+            userName = payload.getUserName();
+        }catch(Exception e) {
+            userId = "admin";
+            userName = "admins";
+        }
+        model.setWorkRecorderNo(userId);
+        model.setWorkRecorderName(userName);
+        meterWorkShiftReportGroupMapper.insert(model);
+        return model;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkshiftreportmeasurement/controller/MeterWorkShiftReportMeasurementController.java

@@ -0,0 +1,128 @@
+package com.steerinfo.meterwork.meterworkshiftreportmeasurement.controller;
+
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup;
+import com.steerinfo.meterwork.meterworkshiftreportmeasurement.model.MeterWorkShiftReportMeasurement;
+import com.steerinfo.meterwork.meterworkshiftreportmeasurement.service.IMeterWorkShiftReportMeasurementService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterWorkShiftReportMeasurement RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-16 03:10
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-16
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkShiftReportMeasurement RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/meterworkshiftreportmeasurements")
+public class MeterWorkShiftReportMeasurementController extends BaseRESTfulController {
+
+    @Autowired
+    IMeterWorkShiftReportMeasurementService meterWorkShiftReportMeasurementService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkshiftreportmeasurement:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkShiftReportMeasurement> list = meterWorkShiftReportMeasurementService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkshiftreportmeasurement:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkShiftReportMeasurement> list = meterWorkShiftReportMeasurementService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据MeterWorkShiftReportMeasurement对象创建")
+    @ApiImplicitParam(name = "meterWorkShiftReportMeasurement", value = "详细实体meterWorkShiftReportMeasurement", required = true, dataType = "MeterWorkShiftReportMeasurement")
+    //@RequiresPermissions("meterworkshiftreportmeasurement:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute MeterWorkShiftReportMeasurement model){
+        MeterWorkShiftReportMeasurement meterWorkShiftReportMeasurement = meterWorkShiftReportMeasurementService.add(model);
+        return success(meterWorkShiftReportMeasurement);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkshiftreportmeasurement:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable String id){
+        MeterWorkShiftReportMeasurement meterWorkShiftReportMeasurement = meterWorkShiftReportMeasurementService.getById(id);
+        return success(meterWorkShiftReportMeasurement);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkShiftReportMeasurement信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String"),
+        @ApiImplicitParam(name = "meterWorkShiftReportMeasurement", value = "详细实体meterWorkShiftReportMeasurement", required = true, dataType = "MeterWorkShiftReportMeasurement")
+    })
+    //@RequiresPermissions("meterworkshiftreportmeasurement:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable String id, @RequestBody MeterWorkShiftReportMeasurement model){
+        model.setId(id);
+        MeterWorkShiftReportMeasurement meterWorkShiftReportMeasurement = meterWorkShiftReportMeasurementService.modify(model);
+        return success(meterWorkShiftReportMeasurement);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "String")
+    //@RequiresPermissions("meterworkshiftreportmeasurement:delete")
+    @DeleteMapping(value = "/{id}")//String
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<String> ids = ListUtils.convertList(list);
+			  meterWorkShiftReportMeasurementService.delete(ids);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value="根据日期查询", notes="只能查询一条数据")
+    @PostMapping(value = "/likeByCreateTime")
+    public RESTfulResult likeByCreateTime(@RequestBody HashMap parmas){
+        PageList<MeterWorkShiftReportMeasurement> list = meterWorkShiftReportMeasurementService.likeByCreateTime(parmas);
+        return success(list);
+    }
+
+    @ApiOperation(value="修改数据配置", notes="修改数据配置")
+    @PostMapping(value = "/updateModel")
+    public RESTfulResult updateModel(@RequestBody MeterWorkShiftReportMeasurement model){
+        MeterWorkShiftReportMeasurement meterWorkShiftReport = meterWorkShiftReportMeasurementService.updateModel(model);
+        return success(meterWorkShiftReport);
+    }
+
+    @ApiOperation(value="新增数据配置", notes="新增数据配置")
+    @PostMapping(value = "/addModel")
+    public RESTfulResult addModel(@RequestBody MeterWorkShiftReportMeasurement model){
+        MeterWorkShiftReportMeasurement meterWorkShiftReport = meterWorkShiftReportMeasurementService.addModel(model);
+        return success(meterWorkShiftReport);
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkshiftreportmeasurement/mapper/MeterWorkShiftReportMeasurementMapper.java

@@ -0,0 +1,14 @@
+package com.steerinfo.meterwork.meterworkshiftreportmeasurement.mapper;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup;
+import com.steerinfo.meterwork.meterworkshiftreportmeasurement.model.MeterWorkShiftReportMeasurement;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Mapper
+public interface MeterWorkShiftReportMeasurementMapper extends IBaseMapper<MeterWorkShiftReportMeasurement, String> {
+    List<MeterWorkShiftReportMeasurement> likeByCreateTime(HashMap<String, Object> params);
+}

src/main/java/com/steerinfo/meterwork/meterworkshiftreportmeasurement/mapper/MeterWorkShiftReportMeasurementMapper.xml

@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.meterwork.meterworkshiftreportmeasurement.mapper.MeterWorkShiftReportMeasurementMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.meterwork.meterworkshiftreportmeasurement.model.MeterWorkShiftReportMeasurement">
+    <id column="SHIFT_REPORT_ID" jdbcType="VARCHAR" property="shiftReportId" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="METER_CLASS" jdbcType="VARCHAR" property="meterClass" />
+    <result column="METER_GROUP" jdbcType="VARCHAR" property="meterGroup" />
+    <result column="SHIFT_MAN_NO" jdbcType="VARCHAR" property="shiftManNo" />
+    <result column="SHIFT_MAN_NAME" jdbcType="VARCHAR" property="shiftManName" />
+    <result column="WORK_RECORDER_NO" jdbcType="VARCHAR" property="workRecorderNo" />
+    <result column="WORK_RECORDER_NAME" jdbcType="VARCHAR" property="workRecorderName" />
+    <result column="SHIFT_WORK_LOG" jdbcType="VARCHAR" property="shiftWorkLog" />
+    <result column="COMPARE_RECORDS" jdbcType="VARCHAR" property="compareRecords" />
+    <result column="DEVICE_PROBLEM" jdbcType="VARCHAR" property="deviceProblem" />
+    <result column="WORK_LOG" jdbcType="VARCHAR" property="workLog" />
+  </resultMap>
+  <sql id="columns">
+    SHIFT_REPORT_ID, CREATE_TIME, METER_CLASS, METER_GROUP, SHIFT_MAN_NO, SHIFT_MAN_NAME, 
+    WORK_RECORDER_NO, WORK_RECORDER_NAME, SHIFT_WORK_LOG, COMPARE_RECORDS, DEVICE_PROBLEM, 
+    WORK_LOG
+  </sql>
+  <sql id="columns_alias">
+    t.SHIFT_REPORT_ID, t.CREATE_TIME, t.METER_CLASS, t.METER_GROUP, t.SHIFT_MAN_NO, t.SHIFT_MAN_NAME, 
+    t.WORK_RECORDER_NO, t.WORK_RECORDER_NAME, t.SHIFT_WORK_LOG, t.COMPARE_RECORDS, t.DEVICE_PROBLEM, 
+    t.WORK_LOG
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM METER_WORK_SHIFT_REPORT_MEASUREMENT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM METER_WORK_SHIFT_REPORT_MEASUREMENT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="shiftReportId != null and shiftReportId != ''">
+        and SHIFT_REPORT_ID = #{shiftReportId}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="meterClass != null and meterClass != ''">
+        and METER_CLASS = #{meterClass}
+      </if>
+      <if test="meterGroup != null and meterGroup != ''">
+        and METER_GROUP = #{meterGroup}
+      </if>
+      <if test="shiftManNo != null and shiftManNo != ''">
+        and SHIFT_MAN_NO = #{shiftManNo}
+      </if>
+      <if test="shiftManName != null and shiftManName != ''">
+        and SHIFT_MAN_NAME = #{shiftManName}
+      </if>
+      <if test="workRecorderNo != null and workRecorderNo != ''">
+        and WORK_RECORDER_NO = #{workRecorderNo}
+      </if>
+      <if test="workRecorderName != null and workRecorderName != ''">
+        and WORK_RECORDER_NAME = #{workRecorderName}
+      </if>
+      <if test="shiftWorkLog != null and shiftWorkLog != ''">
+        and SHIFT_WORK_LOG = #{shiftWorkLog}
+      </if>
+      <if test="compareRecords != null and compareRecords != ''">
+        and COMPARE_RECORDS = #{compareRecords}
+      </if>
+      <if test="deviceProblem != null and deviceProblem != ''">
+        and DEVICE_PROBLEM = #{deviceProblem}
+      </if>
+      <if test="workLog != null and workLog != ''">
+        and WORK_LOG = #{workLog}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="shiftReportId != null and shiftReportId != ''">
+        and SHIFT_REPORT_ID LIKE '%${shiftReportId}%'
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="meterClass != null and meterClass != ''">
+        and METER_CLASS LIKE '%${meterClass}%'
+      </if>
+      <if test="meterGroup != null and meterGroup != ''">
+        and METER_GROUP LIKE '%${meterGroup}%'
+      </if>
+      <if test="shiftManNo != null and shiftManNo != ''">
+        and SHIFT_MAN_NO LIKE '%${shiftManNo}%'
+      </if>
+      <if test="shiftManName != null and shiftManName != ''">
+        and SHIFT_MAN_NAME LIKE '%${shiftManName}%'
+      </if>
+      <if test="workRecorderNo != null and workRecorderNo != ''">
+        and WORK_RECORDER_NO LIKE '%${workRecorderNo}%'
+      </if>
+      <if test="workRecorderName != null and workRecorderName != ''">
+        and WORK_RECORDER_NAME LIKE '%${workRecorderName}%'
+      </if>
+      <if test="shiftWorkLog != null and shiftWorkLog != ''">
+        and SHIFT_WORK_LOG LIKE '%${shiftWorkLog}%'
+      </if>
+      <if test="compareRecords != null and compareRecords != ''">
+        and COMPARE_RECORDS LIKE '%${compareRecords}%'
+      </if>
+      <if test="deviceProblem != null and deviceProblem != ''">
+        and DEVICE_PROBLEM LIKE '%${deviceProblem}%'
+      </if>
+      <if test="workLog != null and workLog != ''">
+        and WORK_LOG LIKE '%${workLog}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from METER_WORK_SHIFT_REPORT_MEASUREMENT
+    where SHIFT_REPORT_ID = #{shiftReportId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from METER_WORK_SHIFT_REPORT_MEASUREMENT
+    where 1!=1 
+      <if test="createTime != null">
+        or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+      </if>
+      <if test="meterClass != null and meterClass != ''">
+        or METER_CLASS = #{meterClass}
+      </if>
+      <if test="meterGroup != null and meterGroup != ''">
+        or METER_GROUP = #{meterGroup}
+      </if>
+      <if test="shiftManNo != null and shiftManNo != ''">
+        or SHIFT_MAN_NO = #{shiftManNo}
+      </if>
+      <if test="shiftManName != null and shiftManName != ''">
+        or SHIFT_MAN_NAME = #{shiftManName}
+      </if>
+      <if test="workRecorderNo != null and workRecorderNo != ''">
+        or WORK_RECORDER_NO = #{workRecorderNo}
+      </if>
+      <if test="workRecorderName != null and workRecorderName != ''">
+        or WORK_RECORDER_NAME = #{workRecorderName}
+      </if>
+      <if test="shiftWorkLog != null and shiftWorkLog != ''">
+        or SHIFT_WORK_LOG = #{shiftWorkLog}
+      </if>
+      <if test="compareRecords != null and compareRecords != ''">
+        or COMPARE_RECORDS = #{compareRecords}
+      </if>
+      <if test="deviceProblem != null and deviceProblem != ''">
+        or DEVICE_PROBLEM = #{deviceProblem}
+      </if>
+      <if test="workLog != null and workLog != ''">
+        or WORK_LOG = #{workLog}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkshiftreportmeasurement.model.MeterWorkShiftReportMeasurement">
+    insert into METER_WORK_SHIFT_REPORT_MEASUREMENT (SHIFT_REPORT_ID, CREATE_TIME, METER_CLASS, 
+      METER_GROUP, SHIFT_MAN_NO, SHIFT_MAN_NAME, 
+      WORK_RECORDER_NO, WORK_RECORDER_NAME, SHIFT_WORK_LOG, 
+      COMPARE_RECORDS, DEVICE_PROBLEM, WORK_LOG
+      )
+    values (#{shiftReportId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{meterClass,jdbcType=VARCHAR}, 
+      #{meterGroup,jdbcType=VARCHAR}, #{shiftManNo,jdbcType=VARCHAR}, #{shiftManName,jdbcType=VARCHAR}, 
+      #{workRecorderNo,jdbcType=VARCHAR}, #{workRecorderName,jdbcType=VARCHAR}, #{shiftWorkLog,jdbcType=VARCHAR}, 
+      #{compareRecords,jdbcType=VARCHAR}, #{deviceProblem,jdbcType=VARCHAR}, #{workLog,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkshiftreportmeasurement.model.MeterWorkShiftReportMeasurement">
+    insert into METER_WORK_SHIFT_REPORT_MEASUREMENT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="shiftReportId != null">
+        SHIFT_REPORT_ID,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="meterClass != null">
+        METER_CLASS,
+      </if>
+      <if test="meterGroup != null">
+        METER_GROUP,
+      </if>
+      <if test="shiftManNo != null">
+        SHIFT_MAN_NO,
+      </if>
+      <if test="shiftManName != null">
+        SHIFT_MAN_NAME,
+      </if>
+      <if test="workRecorderNo != null">
+        WORK_RECORDER_NO,
+      </if>
+      <if test="workRecorderName != null">
+        WORK_RECORDER_NAME,
+      </if>
+      <if test="shiftWorkLog != null">
+        SHIFT_WORK_LOG,
+      </if>
+      <if test="compareRecords != null">
+        COMPARE_RECORDS,
+      </if>
+      <if test="deviceProblem != null">
+        DEVICE_PROBLEM,
+      </if>
+      <if test="workLog != null">
+        WORK_LOG,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="shiftReportId != null">
+        #{shiftReportId,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="meterClass != null">
+        #{meterClass,jdbcType=VARCHAR},
+      </if>
+      <if test="meterGroup != null">
+        #{meterGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftManNo != null">
+        #{shiftManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftManName != null">
+        #{shiftManName,jdbcType=VARCHAR},
+      </if>
+      <if test="workRecorderNo != null">
+        #{workRecorderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="workRecorderName != null">
+        #{workRecorderName,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftWorkLog != null">
+        #{shiftWorkLog,jdbcType=VARCHAR},
+      </if>
+      <if test="compareRecords != null">
+        #{compareRecords,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceProblem != null">
+        #{deviceProblem,jdbcType=VARCHAR},
+      </if>
+      <if test="workLog != null">
+        #{workLog,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkshiftreportmeasurement.model.MeterWorkShiftReportMeasurement">
+    update METER_WORK_SHIFT_REPORT_MEASUREMENT
+    set CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      METER_CLASS = #{meterClass,jdbcType=VARCHAR},
+      METER_GROUP = #{meterGroup,jdbcType=VARCHAR},
+      SHIFT_MAN_NO = #{shiftManNo,jdbcType=VARCHAR},
+      SHIFT_MAN_NAME = #{shiftManName,jdbcType=VARCHAR},
+      WORK_RECORDER_NO = #{workRecorderNo,jdbcType=VARCHAR},
+      WORK_RECORDER_NAME = #{workRecorderName,jdbcType=VARCHAR},
+      SHIFT_WORK_LOG = #{shiftWorkLog,jdbcType=VARCHAR},
+      COMPARE_RECORDS = #{compareRecords,jdbcType=VARCHAR},
+      DEVICE_PROBLEM = #{deviceProblem,jdbcType=VARCHAR},
+      WORK_LOG = #{workLog,jdbcType=VARCHAR}
+    where SHIFT_REPORT_ID = #{shiftReportId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkshiftreportmeasurement.model.MeterWorkShiftReportMeasurement">
+    update METER_WORK_SHIFT_REPORT_MEASUREMENT
+    <set>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="meterClass != null">
+        METER_CLASS = #{meterClass,jdbcType=VARCHAR},
+      </if>
+      <if test="meterGroup != null">
+        METER_GROUP = #{meterGroup,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftManNo != null">
+        SHIFT_MAN_NO = #{shiftManNo,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftManName != null">
+        SHIFT_MAN_NAME = #{shiftManName,jdbcType=VARCHAR},
+      </if>
+      <if test="workRecorderNo != null">
+        WORK_RECORDER_NO = #{workRecorderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="workRecorderName != null">
+        WORK_RECORDER_NAME = #{workRecorderName,jdbcType=VARCHAR},
+      </if>
+      <if test="shiftWorkLog != null">
+        SHIFT_WORK_LOG = #{shiftWorkLog,jdbcType=VARCHAR},
+      </if>
+      <if test="compareRecords != null">
+        COMPARE_RECORDS = #{compareRecords,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceProblem != null">
+        DEVICE_PROBLEM = #{deviceProblem,jdbcType=VARCHAR},
+      </if>
+      <if test="workLog != null">
+        WORK_LOG = #{workLog,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where SHIFT_REPORT_ID = #{shiftReportId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where SHIFT_REPORT_ID = #{shiftReportId,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into METER_WORK_SHIFT_REPORT_MEASUREMENT 
+      (SHIFT_REPORT_ID, 
+      CREATE_TIME, METER_CLASS, METER_GROUP, 
+      SHIFT_MAN_NO, SHIFT_MAN_NAME, WORK_RECORDER_NO, 
+      WORK_RECORDER_NAME, SHIFT_WORK_LOG, 
+      COMPARE_RECORDS, DEVICE_PROBLEM, 
+      WORK_LOG)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.shiftReportId,jdbcType=VARCHAR}, 
+      #{item.createTime,jdbcType=TIMESTAMP}, #{item.meterClass,jdbcType=VARCHAR}, #{item.meterGroup,jdbcType=VARCHAR}, 
+      #{item.shiftManNo,jdbcType=VARCHAR}, #{item.shiftManName,jdbcType=VARCHAR}, #{item.workRecorderNo,jdbcType=VARCHAR}, 
+      #{item.workRecorderName,jdbcType=VARCHAR}, #{item.shiftWorkLog,jdbcType=VARCHAR}, 
+      #{item.compareRecords,jdbcType=VARCHAR}, #{item.deviceProblem,jdbcType=VARCHAR}, 
+      #{item.workLog,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update METER_WORK_SHIFT_REPORT_MEASUREMENT
+     set
+       SHIFT_REPORT_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.shiftReportId,jdbcType=VARCHAR}
+       </foreach>
+       ,CREATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,METER_CLASS=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.meterClass,jdbcType=VARCHAR}
+       </foreach>
+       ,METER_GROUP=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.meterGroup,jdbcType=VARCHAR}
+       </foreach>
+       ,SHIFT_MAN_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.shiftManNo,jdbcType=VARCHAR}
+       </foreach>
+       ,SHIFT_MAN_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.shiftManName,jdbcType=VARCHAR}
+       </foreach>
+       ,WORK_RECORDER_NO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workRecorderNo,jdbcType=VARCHAR}
+       </foreach>
+       ,WORK_RECORDER_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workRecorderName,jdbcType=VARCHAR}
+       </foreach>
+       ,SHIFT_WORK_LOG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.shiftWorkLog,jdbcType=VARCHAR}
+       </foreach>
+       ,COMPARE_RECORDS=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.compareRecords,jdbcType=VARCHAR}
+       </foreach>
+       ,DEVICE_PROBLEM=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.deviceProblem,jdbcType=VARCHAR}
+       </foreach>
+       ,WORK_LOG=
+       <foreach collection="list" item="item" index="index" separator=" " open="case SHIFT_REPORT_ID" close="end">
+          when #{item.shiftReportId,jdbcType=VARCHAR} then #{item.workLog,jdbcType=VARCHAR}
+       </foreach>
+     where SHIFT_REPORT_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.shiftReportId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from METER_WORK_SHIFT_REPORT_MEASUREMENT
+    where SHIFT_REPORT_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="likeByCreateTime" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    where 1 = 1
+    <if test="createTime != null">
+      and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+    </if>
+    <if test="meterClass != null and meterClass != ''">
+      and METER_CLASS LIKE '%${meterClass}%'
+    </if>
+    <if test="meterGroup != null and meterGroup != ''">
+      and METER_GROUP LIKE '%${meterGroup}%'
+    </if>
+    <if test="shiftManNo != null and shiftManNo != ''">
+      and SHIFT_MAN_NO LIKE '%${shiftManNo}%'
+    </if>
+    <if test="shiftManName != null and shiftManName != ''">
+      and SHIFT_MAN_NAME LIKE '%${shiftManName}%'
+    </if>
+  </select>
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkshiftreportmeasurement/model/MeterWorkShiftReportMeasurement.java

@@ -0,0 +1,213 @@
+package com.steerinfo.meterwork.meterworkshiftreportmeasurement.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+@ApiModel(value="统计测量班交接班报表")
+public class MeterWorkShiftReportMeasurement implements IBasePO<String> {
+    /**
+     * 交接班主键(SHIFT_REPORT_ID,VARCHAR,50)
+     */
+    @ApiModelProperty(value="交接班主键",required=true)
+    private String shiftReportId;
+
+    /**
+     * 日期(CREATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="日期",required=false)
+    private Date createTime;
+
+    /**
+     * 班次(METER_CLASS,VARCHAR,20)
+     */
+    @ApiModelProperty(value="班次",required=false)
+    private String meterClass;
+
+    /**
+     * 班组(METER_GROUP,VARCHAR,50)
+     */
+    @ApiModelProperty(value="班组",required=false)
+    private String meterGroup;
+
+    /**
+     * 交班人编号(SHIFT_MAN_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="交班人编号",required=false)
+    private String shiftManNo;
+
+    /**
+     * 交班人(SHIFT_MAN_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="交班人",required=false)
+    private String shiftManName;
+
+    /**
+     * 工作记录人编号(WORK_RECORDER_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="工作记录人编号",required=false)
+    private String workRecorderNo;
+
+    /**
+     * 工作记录人(WORK_RECORDER_NAME,VARCHAR,50)
+     */
+    @ApiModelProperty(value="工作记录人",required=false)
+    private String workRecorderName;
+
+    /**
+     * 检定校准(SHIFT_WORK_LOG,VARCHAR,500)
+     */
+    @ApiModelProperty(value="检定校准",required=false)
+    private String shiftWorkLog;
+
+    /**
+     * 数据核查(COMPARE_RECORDS,VARCHAR,500)
+     */
+    @ApiModelProperty(value="数据核查",required=false)
+    private String compareRecords;
+
+    /**
+     * 测量盘库(DEVICE_PROBLEM,VARCHAR,500)
+     */
+    @ApiModelProperty(value="测量盘库",required=false)
+    private String deviceProblem;
+
+    /**
+     * 工作日志(WORK_LOG,VARCHAR,500)
+     */
+    @ApiModelProperty(value="工作日志",required=false)
+    private String workLog;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.shiftReportId;
+    }
+
+    @Override
+    public void setId(String shiftReportId) {
+        this.shiftReportId = shiftReportId == null ? null : shiftReportId.trim();
+    }
+
+    public String getShiftReportId() {
+        return shiftReportId;
+    }
+
+    public void setShiftReportId(String shiftReportId) {
+        this.shiftReportId = shiftReportId == null ? null : shiftReportId.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getMeterClass() {
+        return meterClass;
+    }
+
+    public void setMeterClass(String meterClass) {
+        this.meterClass = meterClass == null ? null : meterClass.trim();
+    }
+
+    public String getMeterGroup() {
+        return meterGroup;
+    }
+
+    public void setMeterGroup(String meterGroup) {
+        this.meterGroup = meterGroup == null ? null : meterGroup.trim();
+    }
+
+    public String getShiftManNo() {
+        return shiftManNo;
+    }
+
+    public void setShiftManNo(String shiftManNo) {
+        this.shiftManNo = shiftManNo == null ? null : shiftManNo.trim();
+    }
+
+    public String getShiftManName() {
+        return shiftManName;
+    }
+
+    public void setShiftManName(String shiftManName) {
+        this.shiftManName = shiftManName == null ? null : shiftManName.trim();
+    }
+
+    public String getWorkRecorderNo() {
+        return workRecorderNo;
+    }
+
+    public void setWorkRecorderNo(String workRecorderNo) {
+        this.workRecorderNo = workRecorderNo == null ? null : workRecorderNo.trim();
+    }
+
+    public String getWorkRecorderName() {
+        return workRecorderName;
+    }
+
+    public void setWorkRecorderName(String workRecorderName) {
+        this.workRecorderName = workRecorderName == null ? null : workRecorderName.trim();
+    }
+
+    public String getShiftWorkLog() {
+        return shiftWorkLog;
+    }
+
+    public void setShiftWorkLog(String shiftWorkLog) {
+        this.shiftWorkLog = shiftWorkLog == null ? null : shiftWorkLog.trim();
+    }
+
+    public String getCompareRecords() {
+        return compareRecords;
+    }
+
+    public void setCompareRecords(String compareRecords) {
+        this.compareRecords = compareRecords == null ? null : compareRecords.trim();
+    }
+
+    public String getDeviceProblem() {
+        return deviceProblem;
+    }
+
+    public void setDeviceProblem(String deviceProblem) {
+        this.deviceProblem = deviceProblem == null ? null : deviceProblem.trim();
+    }
+
+    public String getWorkLog() {
+        return workLog;
+    }
+
+    public void setWorkLog(String workLog) {
+        this.workLog = workLog == null ? null : workLog.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", shiftReportId=").append(shiftReportId);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", meterClass=").append(meterClass);
+        sb.append(", meterGroup=").append(meterGroup);
+        sb.append(", shiftManNo=").append(shiftManNo);
+        sb.append(", shiftManName=").append(shiftManName);
+        sb.append(", workRecorderNo=").append(workRecorderNo);
+        sb.append(", workRecorderName=").append(workRecorderName);
+        sb.append(", shiftWorkLog=").append(shiftWorkLog);
+        sb.append(", compareRecords=").append(compareRecords);
+        sb.append(", deviceProblem=").append(deviceProblem);
+        sb.append(", workLog=").append(workLog);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkshiftreportmeasurement/service/IMeterWorkShiftReportMeasurementService.java

@@ -0,0 +1,28 @@
+package com.steerinfo.meterwork.meterworkshiftreportmeasurement.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup;
+import com.steerinfo.meterwork.meterworkshiftreportmeasurement.model.MeterWorkShiftReportMeasurement;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterWorkShiftReportMeasurement服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-16 03:10
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-16
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkShiftReportMeasurement服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IMeterWorkShiftReportMeasurementService extends IBaseService<MeterWorkShiftReportMeasurement, String>{
+    PageList<MeterWorkShiftReportMeasurement> likeByCreateTime(HashMap<String, Object> params);
+    MeterWorkShiftReportMeasurement updateModel(MeterWorkShiftReportMeasurement model);
+    MeterWorkShiftReportMeasurement addModel(MeterWorkShiftReportMeasurement model);
+}

src/main/java/com/steerinfo/meterwork/meterworkshiftreportmeasurement/service/impl/MeterWorkShiftReportMeasurementServiceImpl.java

@@ -0,0 +1,93 @@
+package com.steerinfo.meterwork.meterworkshiftreportmeasurement.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.user.UserPayload;
+import com.steerinfo.meterwork.meterworkshiftreportgroup.model.MeterWorkShiftReportGroup;
+import com.steerinfo.meterwork.meterworkshiftreportmeasurement.mapper.MeterWorkShiftReportMeasurementMapper;
+import com.steerinfo.meterwork.meterworkshiftreportmeasurement.model.MeterWorkShiftReportMeasurement;
+import com.steerinfo.meterwork.meterworkshiftreportmeasurement.service.IMeterWorkShiftReportMeasurementService;
+import com.steerinfo.util.PublicMethod;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MeterWorkShiftReportMeasurement服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2022-12-16 03:10
+ * 类描述
+ * 修订历史：
+ * 日期：2022-12-16
+ * 作者：generator
+ * 参考：
+ * 描述：MeterWorkShiftReportMeasurement服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "meterWorkShiftReportMeasurementService")
+public class MeterWorkShiftReportMeasurementServiceImpl extends BaseServiceImpl<MeterWorkShiftReportMeasurement, String> implements IMeterWorkShiftReportMeasurementService {
+
+    @Resource
+    private MeterWorkShiftReportMeasurementMapper meterWorkShiftReportMeasurementMapper;
+
+    @Override
+    protected IBaseMapper<MeterWorkShiftReportMeasurement, String> getMapper() {
+        return meterWorkShiftReportMeasurementMapper;
+    }
+
+    @Override
+    public PageList<MeterWorkShiftReportMeasurement> likeByCreateTime(HashMap<String, Object> params) {
+        PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        List<MeterWorkShiftReportMeasurement> rows = meterWorkShiftReportMeasurementMapper.likeByCreateTime(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
+    @Override
+    public MeterWorkShiftReportMeasurement updateModel(MeterWorkShiftReportMeasurement model) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        sdf.format(model.getCreateTime());
+        String userId;
+        String userName;
+        try{
+            UserPayload payload = UserPayload.getCurrUser();
+            userId = payload.getUserCode();
+            userName = payload.getUserName();
+        }catch(Exception e) {
+            userId = "admin";
+            userName = "admins";
+        }
+        model.setWorkRecorderNo(userId);
+        model.setWorkRecorderName(userName);
+        meterWorkShiftReportMeasurementMapper.updateByPrimaryKeySelective(model);
+        return meterWorkShiftReportMeasurementMapper.selectByPrimaryKey(model.getShiftReportId());
+    }
+
+    @Override
+    public MeterWorkShiftReportMeasurement addModel(MeterWorkShiftReportMeasurement model) {
+        model.setShiftReportId(PublicMethod.IdCreate(3));
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        sdf.format(model.getCreateTime());
+        String userId;
+        String userName;
+        try{
+            UserPayload payload = UserPayload.getCurrUser();
+            userId = payload.getUserCode();
+            userName = payload.getUserName();
+        }catch(Exception e) {
+            userId = "admin";
+            userName = "admins";
+        }
+        model.setWorkRecorderNo(userId);
+        model.setWorkRecorderName(userName);
+        meterWorkShiftReportMeasurementMapper.insert(model);
+        return model;
+    }
+}