。。

src/main/java/com/unissoft/ventilation/controller/ProcessAuditController.java

@@ -51,7 +51,7 @@ public class ProcessAuditController {
 	/**
 	 * 机械通风列表
 	 */
-    @ApiOperation(value = "分页条件查询", notes = "提交参数(type、houseId、depotId必填,没有houseId的就不填)：{\"pageIndex\":1,\"pageSize\":10,  \"condition\":\"{\'type\':\'\',\'depotId\':\'\',\'houseId\':\'\',\'startTime\':\'\',\'endTime\':\'\'}\"}")
+    @ApiOperation(value = "分页条件查询", notes = "提交参数(type、houseId、depotId必填,没有houseId的就不填)：{\"pageIndex\":1,\"pageSize\":10,  \"condition\":\"{\'equipmentId\':\'\',\'type\':\'\',\'depotId\':\'\',\'houseId\':\'\',\'startTime\':\'\',\'endTime\':\'\'}\"}")
     @PostMapping("/getPage")
     public ResultView getPage(@RequestBody PageParam pageParam) throws Exception{
     	Page<ProcessAudit> page = processAuditService.getPage(pageParam);
@@ -63,12 +63,12 @@ public class ProcessAuditController {
      * @param id
      * @return
      */
-    @ApiOperation(value = "根据id和审批状态查询", notes = "")
+    /*@ApiOperation(value = "根据id和审批状态查询", notes = "")
     @GetMapping("/getById/{id}")
     public ResultView getById(@PathVariable Integer id) {
     	List<Map<String,Object>> list = processAuditService.getAllById(id);
         return ResultView.success(list);
-    }
+    }*/
     
     
     /**

src/main/java/com/unissoft/ventilation/service/ProcessAuditService.java

@@ -26,7 +26,7 @@ public interface ProcessAuditService extends IService<ProcessAudit> {
 
 	Page<ProcessAudit> getPage(PageParam pageParam)throws Exception;
 
-	List<Map<String, Object>> getAllById(Integer id);
+	//List<Map<String, Object>> getAllById(Integer id);
 
 	void deleteById(Integer id);
 

src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -296,17 +296,20 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
             Integer equipmentId = object.optInt("equipmentId");
             String startTime = object.optString("startTime");
             String endTime = object.optString("endTime");
+            String type = object.optString("type");
+            String houseId = object.optString("houseId");
+            String depotId = object.optString("depotId");
             
-            if("" != equipmentId+""){
+            if("" != equipmentId+"" && equipmentId != 0){
             	ew.eq("equipment_id", equipmentId);
             }else{
-            	if (StringUtils.isNotBlank(object.optString("type"))) {
-                	if(object.optString("type").equals("xz") || object.optString("type").equals("sswx") || object.optString("type").equals("sbly")){
-                		ew.like("type",object.optString("type"));
+            	if (StringUtils.isNotBlank(type)) {
+                	if(type.equals("xz") || type.equals("sswx") || type.equals("sbly")){
+                		ew.like("type",type);
                 		ew.eq("result", 1);//取第一条数据
                 	}else{
-                		ew.eq("type", object.optString("type"));
-                        if(object.optString("type").equals("yjbg")){//药剂保管
+                		ew.eq("type", type);
+                        if(type.equals("yjbg")){//药剂保管
                         	ew.eq("result", 2);//药剂保管d第一条数据
                         }else{
                         	ew.eq("result", 1);//取第一条数据
@@ -318,11 +321,11 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
                 }
             }
             
-            if (StringUtils.isNotBlank(object.optString("houseId"))) {
-                ew.eq("house_id", object.optString("houseId"));
+            if (StringUtils.isNotBlank(houseId)) {
+                ew.eq("house_id", houseId);
             }
-            if (StringUtils.isNotBlank(object.optString("depotId"))) {
-                ew.eq("depot_id", object.optString("depotId"));
+            if (StringUtils.isNotBlank(depotId)) {
+                ew.eq("depot_id", depotId);
             }
 
             if (StringUtils.isNotBlank(startTime) || StringUtils.isNotBlank(endTime)) {
@@ -348,7 +351,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
 
     //noUse
-    @Override
+/*@Override
     public List<Map<String, Object>> getAllById(Integer id) {
         // TODO Auto-generated method stub
         List<Map<String, Object>> list1 = new ArrayList<>();
@@ -389,7 +392,7 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
         }
 
         return list1;
-    }
+    }*/
 
 
     /**
@@ -414,9 +417,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
 
         org.json.JSONObject object = new org.json.JSONObject(pageParam.getCondition());
+        Integer userId = object.getInt("userId");
         QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(object.optString("userId"))) {
-            ew.eq("to_people", object.getInt("userId"));
+        if (StringUtils.isNotBlank(userId+"")) {
+            ew.eq("to_people", userId);
             ew.eq("audit_state", 0);//已提交
             //ew.and(x->x.eq("audit_state", 0).or().isNull("audit_state"));
         }
@@ -1074,9 +1078,11 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
         QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
         org.json.JSONObject object = new org.json.JSONObject(pageParam.getCondition());
-        if (StringUtils.isNotBlank(object.optString("userId"))) {
-            ew.eq("apply_people", object.optString("userId"));
-            ew.eq("from_people", object.optString("userId"));
+        String userId = object.optString("userId");
+
+        if (StringUtils.isNotBlank(userId)) {
+            ew.eq("apply_people", userId);
+            ew.eq("from_people", userId);
         }
         //ew.eq("result", 1);//整个流程的第一条数据
         //只获取审批的数据
@@ -1135,9 +1141,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 
         QueryWrapper<ProcessAudit> ew = new QueryWrapper<>();
         org.json.JSONObject object = new org.json.JSONObject(pageParam.getCondition());
-        if (StringUtils.isNotBlank(object.optString("userId"))) {
+        String userId = object.optString("userId");
+        if (StringUtils.isNotBlank(userId)) {
             //如果是第一个审批人 则第一条数据中状态不为0(提交)
-            ew.eq("to_people", object.optString("userId"));
+            ew.eq("to_people", userId);
             //ew.eq("result",1);//整个流程的第一条数据
             //ew.ne("audit_state",0);
 
@@ -1723,8 +1730,9 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
 	public void drugDetailsAdd(String parameter) throws JSONException {
 		JSONObject jsStr = new JSONObject(parameter);
         String processId = "";
-        if(null != jsStr.optString("processId") && !jsStr.optString("processId").equals("")){
-        	 processId = jsStr.optString("processId");//流程id 用于修改
+        String receiveProcessId = jsStr.optString("processId");
+        if(null != receiveProcessId && !receiveProcessId.equals("")){
+        	 processId = receiveProcessId;//流程id 用于修改
         }else{
         	 processId = UUID.randomUUID().toString();//生成一个流程id
         }