Merge branch 'dev' of depot-qinghai/depot-system-qinghai into master

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

@@ -108,35 +108,20 @@
 
     </select>
     <select id="findById" resultType="Map" resultMap="BaseResultMap">
-        SELECT DISTINCT
-            bui.dwmc,
-            bui.id unitInfoId,
-            bui.dwdm,
-            bui.fddbr,
-            bui.dwlx,
-            bui.zcdz,
-            bui.cfs,
-            bui.ygs,
-            dict.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,
-            SUM(oi.depot_area) depotArea,
-            SUM(bs.actual_capacity)actualCapacity,
-            bgqa.apply_status,bgqa.apply_type,bgqa.id
+        SELECT
+        bgqa.id, A.dwmc,A.id unitInfoId, A.dwdm,A.fddbr,A.dwlx,A.zcdz,A.cfs,A.ygs,A.DICT_LABEL,bgqa.apply_status,bgqa.apply_type,
+        bse.certified_storekeeper_count ,bse.certified_inspector_count ,bse.warehouse_facility_situation ,
+        bse.full_time_staff_count ,bgqa.storage_expire_time ,bgqa.attachment attachment,bgqa.sqr_enterprise_id
         FROM
-            province_all.biz_unit_info bui
-                LEFT JOIN province_all.dev_dict dict ON bui.dwlx = dict.id
-                LEFT JOIN province_all.biz_sqr_enterprise bse ON bse.unit_info_id = bui.id
-                left join province_all.biz_sqr_enterprise_apply bgqa  on bgqa.sqr_enterprise_id =bse.id
-                left join depot_qh.org_info oi on oi.unit_info_id=bui.id
-                left join depot_qh.basic_storehouse bs on bs.org_id=oi.org_id
-        WHERE
-            bui.delete_flag = 'NOT_DELETE'
-            and bui.id =#{unitInfoId,jdbcType=VARCHAR}
+        province_all.biz_sqr_enterprise_apply bgqa
+        left join province_all.biz_sqr_enterprise  bse on bgqa.sqr_enterprise_id =bse.id
+        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
+        <if test="unitInfoId != null and unitInfoId != ''">
+            where bui.id =#{unitInfoId,jdbcType=VARCHAR}
+        </if>
+
+        )A  on bgqa.unit_info_id = A.id
+        where bgqa.id=#{id,jdbcType=INTEGER} and bgqa.apply_type=#{applyType,jdbcType=INTEGER}
     </select>
 
     <select id="findById1" resultType="Map" resultMap="BaseResultMap">

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

@@ -14,6 +14,7 @@ package com.chinaitop.depot.sqr.mapper;
 
 
 import com.chinaitop.depot.sqr.model.BizSqrEnterprise;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -39,5 +40,5 @@ public interface BizSqrEnterpriseMapper {
 
     BizSqrEnterprise fibdByEnterprise(String unitInfoId);
 
-	BizSqrEnterprise findById(String id);
+	BizSqrEnterprise findById(@Param("id") String id);
 }

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

@@ -27,6 +27,8 @@
         <result column="cfs" property="cfs" jdbcType="VARCHAR" />
         <result column="ygs" property="ygs" jdbcType="INTEGER" />
         <result column="DICT_LABEL" property="dictLabel" jdbcType="VARCHAR" />
+        <result column="depotArea" property="depotArea" jdbcType="DECIMAL" />
+        <result column="actualCapacity" property="actualCapacity" jdbcType="DECIMAL" />
     </resultMap>
 
 
@@ -102,35 +104,34 @@
 
 
    <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 DISTINCT
+    bui.dwmc,
+    bui.id unitInfoId,
+    bui.dwdm,
+    bui.fddbr,
+    bui.dwlx,
+    bui.zcdz,
+    bui.cfs,
+    bui.ygs,
+    dict.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,
+    SUM(oi.depot_area) depotArea,
+    COALESCE(SUM(bs.actual_capacity), 0) AS actualCapacity,
+    bse.id
+FROM
+    province_all.biz_unit_info bui
+        LEFT JOIN province_all.dev_dict dict ON bui.dwlx = dict.id
+        LEFT JOIN province_all.biz_sqr_enterprise bse ON bse.unit_info_id = bui.id
+        left join depot_qh.org_info oi on oi.unit_info_id=bui.id
+        left join depot_qh.basic_storehouse bs on bs.org_id=oi.org_id
+WHERE
+    bui.delete_flag = 'NOT_DELETE' and bse.`status`in(2,3)
+  and bui.id =#{id}
    </select>
 
 </mapper>

src/main/java/com/chinaitop/depot/sqr/model/vo/BizSqrEnterpriseVO.java

@@ -4,6 +4,8 @@ import com.chinaitop.depot.sqr.model.BizSqrEnterprise;
 import com.chinaitop.depot.sqr.model.BizSqrEnterpriseApply;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
+
 public class BizSqrEnterpriseVO extends BizSqrEnterprise {
 
     private String dwmc;
@@ -17,6 +19,9 @@ public class BizSqrEnterpriseVO extends BizSqrEnterprise {
 
     private String dictLabel;
 
+    private BigDecimal depotArea;
+    private BigDecimal actualCapacity;
+
 
     /** 仓房设施设备情况 */
     @ApiModelProperty(value = "仓房设施设备情况", position = 11)
@@ -94,6 +99,22 @@ public class BizSqrEnterpriseVO extends BizSqrEnterprise {
         return dictLabel;
     }
 
+    public BigDecimal getDepotArea() {
+        return depotArea;
+    }
+
+    public void setDepotArea(BigDecimal depotArea) {
+        this.depotArea = depotArea;
+    }
+
+    public BigDecimal getActualCapacity() {
+        return actualCapacity;
+    }
+
+    public void setActualCapacity(BigDecimal actualCapacity) {
+        this.actualCapacity = actualCapacity;
+    }
+
     public void setDictLabel(String dictLabel) {
         this.dictLabel = dictLabel;
     }

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

@@ -177,6 +177,7 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
                         bizSqrEnterpriseApply.setCreateTime(new Date());
                         bizSqrEnterpriseApply.setUpdateTime(new Date());
                         bizSqrEnterpriseApplyMapper.insert(bizSqrEnterpriseApply);
+                        saveAndcreatRequest(bizSqrEnterpriseApply,userName);
                     }
 
                 }else{

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

@@ -57,8 +57,11 @@ public class BizSqrEnterpriseServiceImpl implements BizSqrEnterpriseService {
 
 	@Override
 	public BizSqrEnterprise findById(String id) {
-		// TODO Auto-generated method stub
-		return bizSqrEnterpriseMapper.findById(id);
+        BizSqrEnterprise bizSqrEnterprise= bizSqrEnterpriseMapper.findById(id);
+        if(bizSqrEnterprise!=null){
+            return bizSqrEnterprise;
+        }
+		return null;
 	}
 
 

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

@@ -26,6 +26,7 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -95,7 +96,7 @@ public class RoleInfoController {
 		PageInfo<RoleInfo> pageInfo = null;
 		try {
 			if(parentId == 0) {//是顶级机构，则获取出入库的角色信息
-				if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
+				/*if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
 					ExchangeServer wb = new ExchangeServer();
 					IExchangeService action = wb.getExchangeServiceImplPort();
 					//获取系统所有角色
@@ -112,7 +113,7 @@ public class RoleInfoController {
 						roleInfo.setRoleId(100+i);
 						list.add(roleInfo);
 					}
-				}
+				}*/
 			}
 		} finally {
 			pageInfo = new PageInfo<RoleInfo>(list);
@@ -126,7 +127,7 @@ public class RoleInfoController {
 	 * @param roleId	角色编号
 	 * @return	RoleInfo 角色信息
 	 */
-	@RequestMapping(value="/edit")
+	@RequestMapping(value="/edit",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
 	public RoleInfo edit(Integer roleId) {
 		RoleInfo roleInfo = new RoleInfo();
 		if (roleId != null) {
@@ -154,7 +155,7 @@ public class RoleInfoController {
 			return roleInfoService.validRoleName(roleName,roleId);
 		}else {
 			try {
-				if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
+				/*if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
 					ExchangeServer wb = new ExchangeServer();
 					IExchangeService action = wb.getExchangeServiceImplPort();
 					//获取系统所有角色
@@ -168,7 +169,7 @@ public class RoleInfoController {
 							return false;
 						}
 					}
-				}
+				}*/
 			}catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -309,7 +310,7 @@ public class RoleInfoController {
 		}
 		
 		//追加出入库的角色信息
-		if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
+		/*if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
 			try {
 				ExchangeServer wb = new ExchangeServer();
 				IExchangeService action = wb.getExchangeServiceImplPort();
@@ -329,7 +330,7 @@ public class RoleInfoController {
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-		}
+		}*/
 		
 		modelMap.put("roleList", voList);
 		modelMap.put("roleNameObj", roleNameObj);
@@ -343,7 +344,7 @@ public class RoleInfoController {
 		List<Map<String, Object>> funcList = new ArrayList<Map<String, Object>>();
 		List<Map<String, Object>> btnList = new ArrayList<Map<String, Object>>();
 		//追加出入库的角色信息
-		if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
+		/*if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
 			try {
 				ExchangeServer wb = new ExchangeServer();
 				IExchangeService action = wb.getExchangeServiceImplPort();
@@ -371,7 +372,7 @@ public class RoleInfoController {
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-		}
+		}*/
 		modelMap.put("funcList", funcList);
 		modelMap.put("btnList", btnList);
 		return modelMap;
@@ -420,5 +421,14 @@ public class RoleInfoController {
 		modelMap.put("status", status.equals("1") ? "success":"fail");
 		return modelMap;
 	}
-
+	
+	/**
+	 * 增加基础的 角色到表里
+	 */
+	@RequestMapping(value="/addBasicRole")
+	public void addBasicRole() {
+		roleInfoService.addBasicRole();
+		
+	}
+	
 }

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

@@ -109,8 +109,6 @@ public class UserInfoController {
 	@Value("${KEY}")
 	private String KEY;
 	
-	@Value("${wsdlUrl}")
-	private String wsdlUrl;
 
 	/**
 	 * 查找用户信息
@@ -129,39 +127,30 @@ public class UserInfoController {
 	public PageInfo<UserInfo> getUserInfo(HttpServletRequest request, Integer pageNum, Integer pageSize,
                                           String username, String realName, Integer roleId, String orgIds) {
 		
-		if (pageNum!=null && pageSize!=null) {
-			PageHelper.startPage(pageNum, pageSize);
-		}
 		
-		HashMap<Object, Object> map = new HashMap<Object, Object>();
+		
+		/*HashMap<Object, Object> map = new HashMap<Object, Object>();
 		map.put("username", username);
 		map.put("realName", realName);
 		map.put("roleId", roleId);
-		List<UserInfo> listAll=userInfoService.queryAll(map);
+		List<UserInfo> listAll=userInfoService.queryAll(map);*/
 		
-		if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
-			try {
-				ExchangeServer wb = new ExchangeServer();
-				IExchangeService action = wb.getExchangeServiceImplPort();
-				for(UserInfo userInfo:listAll) {
-					String roleNames = userInfo.getRoleNames();
-					String userRolesInfo = action.getUserRolesInfo(FLATID, KEY, Integer.toString(userInfo.getUserId()) );
-					JSONObject obj = JSONObject.parseObject(userRolesInfo);  
-					String result = obj.getString("result");
-					JSONArray data = JSONArray.parseArray(result);
-					for(int i=0;i<data.size();i++) {
-						Map<String,Object> maps = (Map<String,Object>)data.get(i);
-						if(roleNames != null && !roleNames.isEmpty()) {
-							roleNames = roleNames + "," + ObjectUtils.toString(maps.get("roleName"),"");
-						}else {
-							roleNames = ObjectUtils.toString(maps.get("roleName"),"");
-						}
-					}
-					userInfo.setRoleNames(roleNames);
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
+		UserInfoExample example = new UserInfoExample();
+		Criteria criteria = example.createCriteria();
+		if(null != username && ""!= username){
+			criteria.andUsernameLike(username);
+		}
+        if(null != realName && ""!= realName){
+        	criteria.andRealNameLike(realName);
+		}
+        if(null != orgIds && ""!= orgIds){
+        	criteria.andOrgIdEqualTo(Integer.valueOf(orgIds));
+        }
+		
+		List<UserInfo> listAll = userInfoService.queryByExample(example);
+		
+		if (pageNum!=null && pageSize!=null) {
+			PageHelper.startPage(pageNum, pageSize);
 		}
 		
 		PageInfo<UserInfo> pageInfo = new PageInfo<UserInfo>(listAll);
@@ -539,7 +528,7 @@ public class UserInfoController {
 		if (userId != null) {
 			userInfo = userInfoService.findById(userId);
 		}
-		if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
+		/*if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
 			try {
 				List<String> roleIds = userInfo.getRoleIds();
 				ExchangeServer wb = new ExchangeServer();
@@ -556,7 +545,7 @@ public class UserInfoController {
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-		}
+		}*/
 		return userInfo;
 	}
 
@@ -578,7 +567,7 @@ public class UserInfoController {
 	public Map<String, Object> save(String userInfoJson , String userRoleIds, String crkRoleIds) {
 		Map<String, Object> modelMap = new HashMap<>();
 		try {
-			modelMap = userInfoService.save(userInfoJson, userRoleIds, crkRoleIds, wsdlUrl, FLATID, KEY);
+			modelMap = userInfoService.save(userInfoJson, userRoleIds, crkRoleIds, null, FLATID, KEY);
 		} catch (Exception e) {
 			modelMap.put("status", "error");
 			e.printStackTrace();

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

@@ -42,6 +42,8 @@
 
 
     <result column="DICT_LABEL" property="dictLabel" jdbcType="VARCHAR" />
+    <result column="depotArea" property="depotArea" jdbcType="DECIMAL" />
+    <result column="actualCapacity" property="actualCapacity" jdbcType="DECIMAL" />
 
   </resultMap>
   <sql id="Example_Where_Clause" >
@@ -158,9 +160,12 @@
   <select id="selectByPrimaryKey1" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select
     <include refid="Base_Column_List" />
-    ,dict.DICT_LABEL
+    ,dict.DICT_LABEL,SUM(oi.depot_area) depotArea,
+    COALESCE(SUM(bs.actual_capacity), 0) AS actualCapacity
     from province_all.biz_unit_info bui
     left  join  province_all.dev_dict dict on bui.dwlx = dict.id
+    left join depot_qh.org_info oi on oi.unit_info_id=bui.id
+    left join depot_qh.basic_storehouse bs on bs.org_id=oi.org_id
     where bui.id = #{id,jdbcType=VARCHAR}
   </select>
   <select id="getOrg" resultMap="BaseResultMap" parameterType="java.lang.String" >

src/main/java/com/chinaitop/depot/system/model/BizUnitInfo.java

@@ -76,6 +76,9 @@ public class BizUnitInfo {
     private BigDecimal jd;
 
     private BigDecimal wd;
+    private BigDecimal depotArea;
+    private BigDecimal actualCapacity;
+
 
     private Byte dwzt;
 
@@ -94,7 +97,21 @@ public class BizUnitInfo {
         this.dictLabel = dictLabel;
     }
 
+    public BigDecimal getDepotArea() {
+        return depotArea;
+    }
+
+    public void setDepotArea(BigDecimal depotArea) {
+        this.depotArea = depotArea;
+    }
 
+    public BigDecimal getActualCapacity() {
+        return actualCapacity;
+    }
+
+    public void setActualCapacity(BigDecimal actualCapacity) {
+        this.actualCapacity = actualCapacity;
+    }
 
     /**
      * 

src/main/java/com/chinaitop/depot/system/service/RoleInfoService.java

@@ -55,4 +55,6 @@ public interface RoleInfoService {
 	 */
 	boolean validRoleName(String roleName,String roleId);
 
+	void addBasicRole();
+
 }

src/main/java/com/chinaitop/depot/system/service/impl/RoleInfoServiceImpl.java

@@ -1,21 +1,34 @@
 package com.chinaitop.depot.system.service.impl;
 
+import com.chinaitop.depot.system.mapper.OrgInfoMapper;
 import com.chinaitop.depot.system.mapper.RoleInfoMapper;
+import com.chinaitop.depot.system.model.OrgInfo;
+import com.chinaitop.depot.system.model.OrgInfoExample;
 import com.chinaitop.depot.system.model.RoleInfo;
 import com.chinaitop.depot.system.model.RoleInfoExample;
 import com.chinaitop.depot.system.model.RoleInfoExample.Criteria;
 import com.chinaitop.depot.system.service.RoleInfoService;
+
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+
+import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+
 @Service
 public class RoleInfoServiceImpl implements RoleInfoService {
 	
 	@Resource
 	private RoleInfoMapper RoleInfoMapper;
+	
+	@Resource
+	private OrgInfoMapper orgInfoMapper;
+	
+	
 
 	@Override
 	public List<RoleInfo> queryByExample(RoleInfoExample example) {
@@ -67,4 +80,58 @@ public class RoleInfoServiceImpl implements RoleInfoService {
 		return true;
 	}
 
+	
+	@Override
+	public void addBasicRole() {
+		// TODO Auto-generated method stub
+		//查询所有的粮库
+		OrgInfoExample example = new OrgInfoExample();
+		com.chinaitop.depot.system.model.OrgInfoExample.Criteria criteria =   example.createCriteria();
+		criteria.andOrgClassIdEqualTo(5318);//粮库
+		List<OrgInfo> list = orgInfoMapper.selectByExample(example);
+		
+		// 所有的角色
+		/**
+		 *  经营人员
+			经营部经理
+			库领导
+			保管员
+			仓储人员
+			仓储部经理
+			系统管理员
+			总经理
+			经理
+			副经理
+			会计
+			出纳
+			秘书
+		 */
+		List<String> roleList = new LinkedList<String>();
+		roleList.add("经营人员");
+		roleList.add("经营部经理");
+		roleList.add("库领导");
+		roleList.add("保管员");
+		roleList.add("仓储人员");
+		roleList.add("仓储部经理");
+		roleList.add("系统管理员");
+		roleList.add("总经理");
+		roleList.add("经理");
+		roleList.add("副经理");
+		roleList.add("会计");
+		roleList.add("出纳");
+		roleList.add("秘书");
+		
+		
+		for(OrgInfo orgInfo:list){
+			
+			for(String roleName:roleList){
+				RoleInfo roleInfo = new RoleInfo();
+				roleInfo.setRoleName(roleName);
+				roleInfo.setOrgId(orgInfo.getOrgId());
+				RoleInfoMapper.insertSelective(roleInfo);
+			}
+		}
+		
+	}
+
 }

src/main/java/com/chinaitop/depot/system/service/impl/UserInfoServiceImpl.java

@@ -313,7 +313,7 @@ public class UserInfoServiceImpl implements UserInfoService {
 		}
 
 		if (StringUtils.isNotBlank(crkRoleIds) && !"[]".equals(crkRoleIds)) {//保存出入库用户角色信息
-			if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
+			//if("正常".equals(NetStateUtil.connectingAddress(wsdlUrl))) {
 				try {
 					String json = "{userId:\""+userInfo.getUserId()+"\", roleIds:"+crkRoleIds+"}";
 					ExchangeServer wb = new ExchangeServer();
@@ -322,7 +322,7 @@ public class UserInfoServiceImpl implements UserInfoService {
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
-			}
+			//}
 
 		}