Merge branch 'dev' of http://101.36.160.140:21044/depot-qinghai/depot-system-qinghai into dev

src/main/java/com/chinaitop/depot/sqr/controller/BizSqrEnterpriseController.java

@@ -15,6 +15,7 @@ package com.chinaitop.depot.sqr.controller;
 
 import com.chinaitop.depot.sqr.model.BizSqrEnterprise;
 import com.chinaitop.depot.sqr.model.BizSqrEnterpriseApply;
+import com.chinaitop.depot.sqr.model.vo.BizSqrEnterpriseApplyVO;
 import com.chinaitop.depot.sqr.service.BizSqrEnterpriseService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -61,6 +62,16 @@ public class BizSqrEnterpriseController {
         return list;
     }
 
+    
+    @ApiOperation("粮承储资格企业详情")
+    @GetMapping("/findById")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键", paramType = "query")
+    })
+    public BizSqrEnterprise findById(String id) {
+
+        return bizSqrEnterpriseService.findById(id);
+    }
 
 
 

src/main/java/com/chinaitop/depot/sqr/mapper/BizSqrEnterpriseMapper.java

@@ -38,4 +38,6 @@ public interface BizSqrEnterpriseMapper {
     List<BizSqrEnterprise> TreeList();
 
     BizSqrEnterprise fibdByEnterprise(String unitInfoId);
+
+	BizSqrEnterprise findById(String id);
 }

src/main/java/com/chinaitop/depot/sqr/mapper/BizSqrEnterpriseMapper.xml

@@ -101,4 +101,36 @@
     </select>
 
 
+   <select id="findById" parameterType="java.lang.String" resultMap="BaseResultMap">
+   		SELECT A.dwmc,
+               A.id  unitInfoId,
+               A.dwdm,
+               A.fddbr,
+               A.dwlx,
+               A.zcdz,
+               A.cfs,
+               A.ygs,
+               A.DICT_LABEL,
+               bse.certified_storekeeper_count,
+               bse.certified_inspector_count,
+               bse.warehouse_facility_situation,
+               bse.full_time_staff_count,
+               bse.storage_expire_time,
+               bse.attachment attachment,
+               bse.id
+        FROM province_all.biz_sqr_enterprise bse
+                 LEFT JOIN (select bui.id,
+                             bui.dwmc,
+                             bui.dwdm,
+                             bui.fddbr,
+                             bui.dwlx,
+                             bui.zcdz,
+                             bui.cfs,
+                             bui.ygs,
+                             dict.DICT_LABEL
+                      from province_all.biz_unit_info bui
+                               left join province_all.dev_dict dict on bui.dwlx = dict.id
+        ) A ON bse.unit_info_id = A.id where A.id = #{id}
+   </select>
+
 </mapper>

src/main/java/com/chinaitop/depot/sqr/service/BizSqrEnterpriseService.java

@@ -38,5 +38,7 @@ public interface BizSqrEnterpriseService {
 
     List<BizSqrEnterprise> TreeList();
 
+	BizSqrEnterprise findById(String id);
+
 
 }

src/main/java/com/chinaitop/depot/sqr/service/impl/BizSqrEnterpriseServiceImpl.java

@@ -55,5 +55,11 @@ public class BizSqrEnterpriseServiceImpl implements BizSqrEnterpriseService {
         return bizSqrEnterpriseMapper.TreeList();
     }
 
+	@Override
+	public BizSqrEnterprise findById(String id) {
+		// TODO Auto-generated method stub
+		return bizSqrEnterpriseMapper.findById(id);
+	}
+
 
 }

src/main/java/com/chinaitop/depot/system/controller/OrgInfoController.java

@@ -143,30 +143,34 @@ public class OrgInfoController {
 	 * @throws JsonParseException
 	 * @throws JsonMappingException
 	 * @throws IOException
+	 * dwdm  是单位的统一社会信用代码
 	 */
 	@RequestMapping(value="/save")
-	public Map<String, Object> save(String orgInfoJson) throws JsonParseException, JsonMappingException, IOException {
+	public Map<String, Object> save(String orgInfoJson,String dwdm) throws JsonParseException, JsonMappingException, IOException {
 		Map<String, Object> modelMap = new HashMap<>();
 		// JSON字符串转对象
 		ObjectMapper mapper = new ObjectMapper();
 		OrgInfo orgInfo = (OrgInfo)mapper.readValue(orgInfoJson, OrgInfo.class);
+		
         if (orgInfo.getOrgId() == null) {
-        	if(!ObjectUtils.toString(orgInfo.getBirdsEye()).isEmpty()) {
-        		String path = uploadPath+orgInfo.getBirdsEye();
-        		byte[] file2byte = FileUtil.file2byte(path);
-        		String hexString = FileUtil.toHexString(file2byte);
-        		orgInfo.setWjl(hexString);
-        	}
+        	
         	/* 保存数据  */
 			orgInfoService.add(orgInfo);
 
-			/* 生成库区标准编码 */
-			String zzdm = orgInfo.getCreditCode();
-			if ("".equals(zzdm)) {
-				zzdm = orgInfo.getCompanyOrgCode();
+			/**
+			 * 库区代码
+			 * 库区代码	单位代码+3位库区顺序码
+			 */
+			if(null != dwdm){
+				String kqbm = dwdm.concat(orgInfo.getOrgCode());
+				orgInfo.setKqbm(kqbm);
+				orgInfoService.updateSelective(orgInfo);
 			}
-//			orgInfo.setKqbm(BusinessUtils.setBZkqbm(zzdm, orgInfo.getOrgId()));
-//			orgInfoService.updateSelective(orgInfo);
+			
+			
+			
+			/*orgInfo.setKqbm(BusinessUtils.setBZkqbm(zzdm, orgInfo.getOrgId()));
+			orgInfoService.updateSelective(orgInfo);*/
 			
 			//默认给新建的机构创建一个系统管理员角色
 			RoleInfo roleInfo = new RoleInfo();
@@ -183,16 +187,23 @@ public class OrgInfoController {
 			List<ButtonInfo> buttonList = buttonInfoService.queryByExample(exampleButton);
 			roleButtonService.saveForList(roleInfo.getRoleId(), buttonList);
 		} else {
-			if(!ObjectUtils.toString(orgInfo.getBirdsEye()).isEmpty()) {
-        		String path = uploadPath+orgInfo.getBirdsEye();
-        		byte[] file2byte = FileUtil.file2byte(path);
+			/*if(!ObjectUtils.toString(orgInfo.getBirdsEye()).isEmpty()) {
+        		byte[] file2byte = FileUtil.file2byte(orgInfo.getBirdsEye());
         		String hexString = FileUtil.toHexString(file2byte);
         		orgInfo.setWjl(hexString);
-        	}
+        	}*/
+			
+			if(null != dwdm){
+				String kqbm = dwdm.concat(orgInfo.getOrgCode());
+				orgInfo.setKqbm(kqbm);
+				orgInfoService.updateSelective(orgInfo);
+			}
+			
+			
 //			orgInfo.setKqbm(BusinessUtils.setBZkqbm(orgInfo.getCreditCode(), orgInfo.getOrgId()));
 //			orgInfoService.update(orgInfo);
 		}
-        if(orgInfo.getParentId() != 0) {//排除顶级机构
+        /*if(orgInfo.getParentId() != 0) {//排除顶级机构
         	//查询父机构id以及层级
         	OrgInfo orgParentInfo = orgInfoService.findById(orgInfo.getParentId());
         	//查询同级机构已存在的级别后2位
@@ -236,7 +247,7 @@ public class OrgInfoController {
         			orgInfoService.update(orgInfo);
         		}
         	}
-        }
+        }*/
 		modelMap.put("status", "success");
 		modelMap.put("newOrgId", orgInfo.getOrgId());
 		return modelMap;
@@ -367,5 +378,10 @@ public class OrgInfoController {
     	return modelMap;
     }*/
 	
+	public static void main(String[] args) {
+		String  a = "中国";
+		System.out.println(a.length());
+				
+	}
 	
 }

src/main/java/com/chinaitop/depot/system/mapper/UserInfoMapper.xml

@@ -707,7 +707,7 @@
                      #{item}
                    </foreach>
                  </if>
-                 and length(ui.real_name) &lt; 13
+                 and length(ui.real_name) &lt;16
 		 </where>
     ) A LEFT JOIN (
 		 SELECT