Browse Source

lrl - 2021-11-13

lirl 3 years ago
parent
commit
bea0d6ee01

+ 19 - 0
src/main/java/com/steerinfo/ems/emsprodplanround/controller/EmsProdplanRoundController.java

@@ -420,4 +420,23 @@ public class EmsProdplanRoundController extends BaseRESTfulController {
         return success(emsProdplanRounds);
     }
 
+    @ApiOperation(value="获取列表", notes="展开查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("emsprodplanround:view")
+    @GetMapping(value = "/getTableDetailAsRadio")
+    public RESTfulResult getTableDetailAsRadio (@RequestParam HashMap<String, Object>  parmas,Integer pageNum, Integer pageSize){
+        if(parmas.get("id") != null && !parmas.get("id").toString().isEmpty()){
+            String id = parmas.get("id").toString();
+            if(!id.startsWith("'")){
+                id = "'" + id.replaceAll(",", "','").replaceAll(",", "','") + "'";
+            }
+            parmas.put("id", id);
+        }
+        PageList pageList = emsProdplanRoundService.getTableDetailAsRadioForPage(parmas, pageNum, pageSize);
+         return success(pageList);
+    }
+
 }

+ 3 - 0
src/main/java/com/steerinfo/ems/emsprodplanround/mapper/EmsProdplanRoundMapper.java

@@ -35,4 +35,7 @@ public interface EmsProdplanRoundMapper extends IBaseMapper<EmsProdplanRound, St
     Integer updateAuditState(EmsProdplanRound emsProdplanRound);
     //
     List<EmsProdplanRound> getRounds(EmsProdplanRound emsProdplanRound);
+    //展开查询
+    public List<EmsProdplanRound> getTableDetailAsRadio(HashMap<String, Object> parmas);
+
 }

+ 8 - 1
src/main/java/com/steerinfo/ems/emsprodplanround/mapper/EmsProdplanRoundMapper.xml

@@ -797,5 +797,12 @@
     from ems_prodplan_round
    where CHEMICAL_STANDARD not like '%null%'
   </select>
-
+   <select id="getTableDetailAsRadio" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+     <include refid="select"/>
+     <where>
+       <if test="id != null and id != '' ">
+         and PARENTID in (${id})
+       </if>
+     </where>
+   </select>
 </mapper>

+ 2 - 0
src/main/java/com/steerinfo/ems/emsprodplanround/service/IEmsProdplanRoundService.java

@@ -49,4 +49,6 @@ public interface IEmsProdplanRoundService extends IBaseService<EmsProdplanRound,
     Integer updateAuditState(EmsProdplanRound emsProdplanRound);
     //
     List<EmsProdplanRound> getRounds(EmsProdplanRound emsProdplanRound);
+    //
+    PageList<EmsProdplanRound>getTableDetailAsRadioForPage(HashMap<String, Object> hashMap, Integer pageNum, Integer pageSize);
 }

+ 15 - 0
src/main/java/com/steerinfo/ems/emsprodplanround/service/impl/EmsProdplanRoundServiceImpl.java

@@ -101,4 +101,19 @@ public class EmsProdplanRoundServiceImpl extends BaseServiceImpl<EmsProdplanRoun
     public List<EmsProdplanRound> getRounds(EmsProdplanRound emsProdplanRound) {
         return emsProdplanRoundMapper.getRounds(emsProdplanRound);
     }
+
+    @Override
+    public  PageList<EmsProdplanRound> getTableDetailAsRadioForPage(HashMap<String, Object> hashMap, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<EmsProdplanRound> datas = emsProdplanRoundMapper.getTableDetailAsRadio(hashMap);
+        PageList pageInfo = new PageList(datas);
+        return pageInfo;
+    }
+
+//    public List<EmsProdplanRound> getTableDetailAsRadiForPage(Map<String, Object> parameters, Integer pageNum, Integer pageSize) {
+//        PageHelper.startPage(pageNum, pageSize);
+//        List<T> rows =
+//        PageList pageInfo = new PageList(rows);
+//        return pageInfo;
+//    }
 }

+ 1 - 1
src/main/java/com/steerinfo/task/SpringCronTask.java

@@ -306,7 +306,7 @@ public class SpringCronTask implements SchedulingConfigurer{
 					 dzMaterialSfService.dataGeneration();
 					 emsScqkLgService.dateGenerate();
 					logger.info("定时任务"+taskId+"执行时长:" + (System.currentTimeMillis() - start)/1000 + "秒");
-				} 
+				}
 				else if(taskId.equalsIgnoreCase("124")){
 					 long start = new Date().getTime();
 					 try {