dengyj 3 سال پیش
والد
کامیت
ec6a5615b1

+ 7 - 0
src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrument/controller/MeterWorkMeasuringInstrumentController.java

@@ -94,6 +94,13 @@ public class MeterWorkMeasuringInstrumentController extends BaseRESTfulControlle
         return success(list);
     }
 
+    @ApiOperation(value="获取录入人列表", notes="不分页查询(createManName)")
+    @GetMapping(value = "/getCreateManNo")
+    public RESTfulResult getCreateManNo(@RequestParam(required = false) HashMap parmas){
+        List<String> list = meterWorkMeasuringInstrumentService.getCreateManNo(parmas);
+        return success(list);
+    }
+
     @ApiOperation(value="创建", notes="根据MeterWorkMeasuringInstrument对象创建")
     @ApiImplicitParam(name = "meterWorkMeasuringInstrument", value = "详细实体meterWorkMeasuringInstrument", required = true, dataType = "MeterWorkMeasuringInstrument")
     //@RequiresPermissions("meterworkmeasuringinstrument:create")

+ 1 - 0
src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrument/mapper/MeterWorkMeasuringInstrumentMapper.java

@@ -13,4 +13,5 @@ import org.apache.ibatis.annotations.Param;
 public interface MeterWorkMeasuringInstrumentMapper extends IBaseMapper<MeterWorkMeasuringInstrument, String> {
     String getNewID(@Param(value="afl")String afl);
     List<MeterWorkMeasuringInstrument> likeDesc(HashMap params);
+    List<String> getCreateManNo(HashMap params);
 }

+ 15 - 0
src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrument/mapper/MeterWorkMeasuringInstrumentMapper.xml

@@ -2771,9 +2771,24 @@
     <if test="materialName != null and materialName != ''">
       and MATERIAL_NAME LIKE '%${materialName}%'
     </if>
+    <if test="updateManNo != null and updateManNo != ''">
+      and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+    </if>
+    <if test="updateManName != null and updateManName != ''">
+      and UPDATE_MAN_NAME LIKE '%${updateManName}'
+    </if>
+    <if test="createManName != null and createManName != ''">
+      and CREATE_MAN_NAME LIKE '%${createManName}%'
+    </if>
     <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
       and  NET_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and NET_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>
     order by net_time desc
   </select>
+
+  <select id="getCreateManNo" parameterType="java.util.HashMap" resultType="String">
+    select distinct create_man_name
+        from METER_WORK_MEASURING_INSTRUMENT
+    group by create_man_name
+  </select>
 </mapper>

+ 1 - 0
src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrument/service/IMeterWorkMeasuringInstrumentService.java

@@ -28,6 +28,7 @@ import java.util.Map;
  */
 public interface IMeterWorkMeasuringInstrumentService extends IBaseService<MeterWorkMeasuringInstrument, String>{
     PageList<MeterWorkMeasuringInstrument> likeDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
+    List<String> getCreateManNo(HashMap<String, Object> params);
     String checkandadd(MeterWorkMeasuringInstrument model);
     RESTfulResult batchAddInfo(List<MeterWorkMeasuringInstrument> models);
     RESTfulResult batchDeleteInfo(List<MeterWorkMeasuringInstrument> models);

+ 6 - 0
src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrument/service/impl/MeterWorkMeasuringInstrumentServiceImpl.java

@@ -54,6 +54,12 @@ public class MeterWorkMeasuringInstrumentServiceImpl extends BaseServiceImpl<Met
         return pageInfo;
     }
 
+    @Override
+    public List<String> getCreateManNo(HashMap<String, Object> params) {
+        List<String> rows = meterWorkMeasuringInstrumentMapper.getCreateManNo(params);
+        return rows;
+    }
+
     @Override
     public String checkandadd(MeterWorkMeasuringInstrument model) {
         if (StringUtils.isEmpty(model.getRailwayNo())) {