保管员管理

src/main/java/com/chinaitop/depot/keeperHouse/mapper/StorageKeeperTransferMapper.xml

@@ -263,27 +263,16 @@
     select
       distinct
     <include refid="Ext_Base_Column_List" />
-        , bk.name AS transUserName,
+        , bk.real_name AS transUserName,
         bs.storehouse_name AS storehouseName,
         uio.real_name AS superiorUserName,
-        sk_temp. NAME AS receiveUserName
-        FROM
-        storage_keepertransfer skr
-        LEFT JOIN basic_keeper bk ON skr.trans_user = bk.user_Id
+        ru.real_name AS receiveUserName
+        FROM storage_keepertransfer skr
+        LEFT JOIN user_info bk on bk.user_id=skr.trans_user
         LEFT JOIN basic_storehouse bs ON bs.storehouse_id = skr.house_id
         LEFT JOIN user_info uio ON uio.user_id = skr.superior_user
-        LEFT JOIN (
-                  SELECT
-                  skr.receive_user,
-                    bk. NAME
-                  FROM
-                  storage_keepertransfer skr
-                  LEFT JOIN basic_keeper bk ON skr.receive_user = bk.user_Id
-                  ) sk_temp ON skr.receive_user = sk_temp.receive_user
+        LEFT JOIN user_info ru ON skr.receive_user = ru.user_Id
     <where>
-      <if test="roleId !=null">
-        bk.post_type =  #{roleId}
-      </if>
       <if test="houseId !=null">
         and skr.house_id = #{houseId}
       </if>

src/main/java/com/chinaitop/depot/sptData/controller/SptController.java

@@ -114,6 +114,9 @@ public class SptController {
 			sptDataVO = sptService.getJybgcqyjList(pageNum, pageSize, kqbm, cfmc);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
+			sptDataVO = new SptDataVO();
+			sptDataVO.setCode("500");
+			sptDataVO.setMsg(e.getMessage());
 		}
 		return sptDataVO;
 	}
@@ -133,6 +136,9 @@ public class SptController {
 			sptDataVO = sptService.getJkqyjxxList(pageNum, pageSize, kqbm, xybh, mxpz);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
+			sptDataVO = new SptDataVO();
+			sptDataVO.setCode("500");
+			sptDataVO.setMsg(e.getMessage());
 		}
 		return sptDataVO;
 	}
@@ -154,6 +160,9 @@ public class SptController {
 			sptDataVO = sptService.getZqlyjxxList(pageNum, pageSize, kqbm, cphm, mxpz, startTime, endTime);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
+			sptDataVO = new SptDataVO();
+			sptDataVO.setCode("500");
+			sptDataVO.setMsg(e.getMessage());
 		}
 		return sptDataVO;
 	}
@@ -228,6 +237,9 @@ public class SptController {
 			sptDataVO = sptService.getkccxbjList(pageNum, pageSize, kqbm, cfmc);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
+			sptDataVO = new SptDataVO();
+			sptDataVO.setCode("500");
+			sptDataVO.setMsg(e.getMessage());
 		}
 		return sptDataVO;
 	}
@@ -247,6 +259,9 @@ public class SptController {
 			sptDataVO = sptService.getkckcbjList(pageNum, pageSize, kqbm, cfmc, cfzt);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
+			sptDataVO = new SptDataVO();
+			sptDataVO.setCode("500");
+			sptDataVO.setMsg(e.getMessage());
 		}
 		return sptDataVO;
 	}
@@ -266,6 +281,9 @@ public class SptController {
 			sptDataVO = sptService.getCccxbjList(pageNum, pageSize, kqbm, cfmc, pzbm);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
+			sptDataVO = new SptDataVO();
+			sptDataVO.setCode("500");
+			sptDataVO.setMsg(e.getMessage());
 		}
 		return sptDataVO;
 	}
@@ -276,7 +294,7 @@ public class SptController {
 		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
         @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
         @ApiImplicitParam(name = "pageType", value = "分页类型", paramType = "query"),
-        //@ApiImplicitParam(name = "kqmc", value = "库区名称", paramType = "query"),
+        @ApiImplicitParam(name = "kqmc", value = "库区名称", paramType = "query"),
         @ApiImplicitParam(name = "cfmc", value = "库区编码", paramType = "query"),
         @ApiImplicitParam(name = "cfmc", value = "仓房名称", paramType = "query"),
         @ApiImplicitParam(name = "pzmc", value = "品种名称", paramType = "query"),
@@ -293,6 +311,9 @@ public class SptController {
 			
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
+			sptDataVO = new SptDataVO();
+			sptDataVO.setCode("500");
+			sptDataVO.setMsg(e.getMessage());
 		}
 		return sptDataVO;
 	}
@@ -310,6 +331,9 @@ public class SptController {
 			
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
+			sptDataVO = new SptDataVO();
+			sptDataVO.setCode("500");
+			sptDataVO.setMsg(e.getMessage());
 		}
 		return sptDataVO;
 	}
@@ -333,6 +357,9 @@ public class SptController {
 			
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
+			sptDataVO = new SptDataVO();
+			sptDataVO.setCode("500");
+			sptDataVO.setMsg(e.getMessage());
 		}
 		return sptDataVO;
 	}
@@ -349,6 +376,9 @@ public class SptController {
 			
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
+			sptDataVO = new SptDataVO();
+			sptDataVO.setCode("500");
+			sptDataVO.setMsg(e.getMessage());
 		}
 		return sptDataVO;
 	}
@@ -367,6 +397,9 @@ public class SptController {
 			sptDataVO = sptService.getSptSpjktjList(pageNum, pageSize, datas, orgId);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
+			sptDataVO = new SptDataVO();
+			sptDataVO.setCode("500");
+			sptDataVO.setMsg(e.getMessage());
 		}
 		return sptDataVO;
 	}

src/main/java/com/chinaitop/depot/sptData/service/impl/SptServiceImpl.java

@@ -156,15 +156,15 @@ public class SptServiceImpl implements SptService {
 		JSONObject datasAll = JSONObject.parseObject(result_data);
 		String status = datasAll.getString("status");
 		SptDataVO sptDataVO = new SptDataVO();
-		if ("ERROR".equals(status)) {
-			sptDataVO.setMsg(datasAll.getString("msg"));
-			sptDataVO.setCode("500");
-		} else {
+		if (!"ERROR".equals(status)) {
 			String datas = datasAll.getString("data");
 			//处理分页数据
 			datas = PageHelperUtils.pageHelper(datas, pageNum, pageSize);
 			sptDataVO.setData(JSONObject.parseObject(datas));
 			sptDataVO.setCode("200");
+		} else {
+			sptDataVO.setMsg(datasAll.getString("msg"));
+			sptDataVO.setCode("500");
 		}
 
 		return sptDataVO;
@@ -198,15 +198,15 @@ public class SptServiceImpl implements SptService {
 		JSONObject datasAll = JSONObject.parseObject(result_data);
 		String status = datasAll.getString("status");
 		SptDataVO sptDataVO = new SptDataVO();
-		if ("ERROR".equals(status)) {
-			sptDataVO.setMsg(datasAll.getString("msg"));
-			sptDataVO.setCode("500");
-		} else {
+		if (!"ERROR".equals(status)) {
 			String datas = datasAll.getString("data");
 			//处理分页数据
 			datas = PageHelperUtils.pageHelper(datas, pageNum, pageSize);
 			sptDataVO.setData(JSONObject.parseObject(datas));
 			sptDataVO.setCode("200");
+		} else {
+			sptDataVO.setMsg(datasAll.getString("msg"));
+			sptDataVO.setCode("500");
 		}
 
 		return sptDataVO;
@@ -246,15 +246,15 @@ public class SptServiceImpl implements SptService {
 		JSONObject datasAll = JSONObject.parseObject(result_data);
 		String status = datasAll.getString("status");
 		SptDataVO sptDataVO = new SptDataVO();
-		if ("ERROR".equals(status)) {
-			sptDataVO.setMsg(datasAll.getString("msg"));
-			sptDataVO.setCode("500");
-		} else {
+		if (!"ERROR".equals(status)) {
 			String datas = datasAll.getString("data");
 			//处理分页数据
 			datas = PageHelperUtils.pageHelper(datas, pageNum, pageSize);
 			sptDataVO.setData(JSONObject.parseObject(datas));
 			sptDataVO.setCode("200");
+		} else {
+			sptDataVO.setMsg(datasAll.getString("msg"));
+			sptDataVO.setCode("500");
 		}
 
 		return sptDataVO;
@@ -425,15 +425,15 @@ public class SptServiceImpl implements SptService {
 		String status = datasAll.getString("status");
 		SptDataVO sptDataVO = new SptDataVO();
 		
-		if ("ERROR".equals(status)) {
-			sptDataVO.setMsg(datasAll.getString("msg"));
-			sptDataVO.setCode("500");
-		} else {
+		if (!"ERROR".equals(status)) {
 			String datas = datasAll.getString("data");
 			//处理分页数据
 			datas = PageHelperUtils.pageHelper(datas, pageNum, pageSize);
 			sptDataVO.setData(JSONObject.parseObject(datas));
 			sptDataVO.setCode("200");
+		} else {
+			sptDataVO.setMsg(datasAll.getString("msg"));
+			sptDataVO.setCode("500");
 		}
 		
 
@@ -451,13 +451,13 @@ public class SptServiceImpl implements SptService {
 		String status = datasAll.getString("status");
 		SptDataVO sptDataVO = new SptDataVO();
 		
-		if ("ERROR".equals(status)) {
-			sptDataVO.setMsg(datasAll.getString("msg"));
-			sptDataVO.setCode("500");
-		} else {
+		if (!"ERROR".equals(status)) {
 			String datas = datasAll.getString("data");
 			sptDataVO.setData(JSONObject.parseObject(datas));
 			sptDataVO.setCode("200");
+		} else {
+			sptDataVO.setMsg(datasAll.getString("msg"));
+			sptDataVO.setCode("500");
 		}
 		
 		return sptDataVO;
@@ -489,16 +489,14 @@ public class SptServiceImpl implements SptService {
 		JSONObject datasAll = JSONObject.parseObject(result_data);
 		String status = datasAll.getString("status");
 		SptDataVO sptDataVO = new SptDataVO();
-		
-		if ("ERROR".equals(status)) {
-			sptDataVO.setMsg(datasAll.getString("msg"));
-			sptDataVO.setCode("500");
-		} else {
+
+		if (!"ERROR".equals(status)) {
 			String datas = datasAll.getString("data");
-			//处理分页数据
-			//datas = PageHelperUtils.pageHelper(datas, pageNum, pageSize);
 			sptDataVO.setData(JSONObject.parseObject(datas));
 			sptDataVO.setCode("200");
+		} else {
+			sptDataVO.setMsg(datasAll.getString("msg"));
+			sptDataVO.setCode("500");
 		}
 		return sptDataVO;
 	
@@ -506,31 +504,31 @@ public class SptServiceImpl implements SptService {
 
 	@Override
 	public SptDataVO getZcfzById(String id) throws Exception {
-		// TODO Auto-generated method stub
+
 		String path = sysCodeService.getSVal(10, "cwbbxq");
 		StringBuffer sbf = new StringBuffer(50);
 		sbf.append(path).append("/").append(id);
-		
+
 		String result_data = OkHttpUtil.get(sbf.toString());
 		JSONObject datasAll = JSONObject.parseObject(result_data);
 		String status = datasAll.getString("status");
 		SptDataVO sptDataVO = new SptDataVO();
-		
-		if ("ERROR".equals(status)) {
-			sptDataVO.setMsg(datasAll.getString("msg"));
-			sptDataVO.setCode("500");
-		} else {
+
+		if (!"ERROR".equals(status)) {
 			String datas = datasAll.getString("data");
 			sptDataVO.setData(JSONObject.parseObject(datas));
 			sptDataVO.setCode("200");
+		} else {
+			sptDataVO.setMsg(datasAll.getString("msg"));
+			sptDataVO.setCode("500");
 		}
-		
+
 		return sptDataVO;
 	}
 
 	@Override
 	public SptDataVO getSptSpjktjList(Integer pageNum, Integer pageSize, String datas, String orgId) throws Exception {
-		
+
 		//通过库区编码查询市平台的企业机构代码,如：LS001074002
 		String qyjgdm = sptDataMapper.getQyjgdm(orgId);
 
@@ -553,7 +551,7 @@ public class SptServiceImpl implements SptService {
 		json_data.put("items", json_data.getString("list"));
 		datas = PageHelperUtils.pageHelper(json_data.toString(), pageNum, pageSize);
 		SptDataVO sptDataVO = new SptDataVO();
-		
+
 		//处理分页数据
 		sptDataVO.setData(JSONObject.parseObject(datas));
 		sptDataVO.setCode(datasAll.getString("code"));