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

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

@@ -63,12 +63,12 @@ public class BizSqrEnterpriseApplyController {
             @ApiImplicitParam(name = "applyType", value = "申请类型", paramType = "query")
 
     })
-    public PageInfo<BizSqrEnterpriseApply> page(Integer pageNum, Integer pageSize,String dwmc,Integer applyType) {
+    public PageInfo<BizSqrEnterpriseApply> page(Integer pageNum, Integer pageSize,String dwmc,Integer applyType,String unitInfoId) {
 
         if (pageNum!=null && pageSize!=null) {
             PageHelper.startPage(pageNum, pageSize);
         }
-        List<BizSqrEnterpriseApply> list = bizGrQeApplyService.findByPage(dwmc,applyType);
+        List<BizSqrEnterpriseApply> list = bizGrQeApplyService.findByPage(dwmc,applyType,unitInfoId);
         PageInfo<BizSqrEnterpriseApply> pageInfo = new PageInfo<BizSqrEnterpriseApply>(list);
         return pageInfo;
     }

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

@@ -101,8 +101,12 @@
                 LEFT JOIN province_all.biz_audit_request bgq ON bgqa.id = bgq.request_id
         where bgqa.apply_type=#{applyType,jdbcType=INTEGER}
         <if test="dwmc != null and dwmc != ''">
-            and bui.dwmc LIKE concat('%', #{dwmc}, '%')
+            and A.dwmc LIKE concat('%', #{dwmc}, '%')
         </if>
+        <if test="unitInfoId != null and unitInfoId != ''">
+            and A.id=#{unitInfoId}
+        </if>
+
         ORDER BY bgqa.id desc
         
 

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

@@ -36,7 +36,7 @@ public interface BizSqrEnterpriseApplyService {
      * @author ZeroLiYi
      * @date  2024/04/28 10:01
      */
-    List<BizSqrEnterpriseApply>findByPage(String dwmc,Integer applyType);
+    List<BizSqrEnterpriseApply>findByPage(String dwmc,Integer applyType,String unitInfoId);
 
 
     BizSqrEnterpriseApplyVO findById(Integer applyType,String unitInfoId,Integer id);

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

@@ -78,10 +78,11 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
 
 
     @Override
-    public  List<BizSqrEnterpriseApply> findByPage(String dwmc,Integer applyType){
+    public  List<BizSqrEnterpriseApply> findByPage(String dwmc,Integer applyType,String unitInfoId){
         Map map=new HashMap<>();
         map.put("dwmc",dwmc);
         map.put("applyType",applyType);
+        map.put("unitInfoId",unitInfoId);
        return bizSqrEnterpriseApplyMapper.findByPage(map);
     }
 
@@ -116,6 +117,7 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
         Integer orgId = null;
         String userName = "";
         Map<String, Object> modelMap1 = new HashMap<String, Object>();
+        String msg= "该企业已有承储资格，请勿重复申请";
         //获取单位信息
         String dwbm = "";
         String ajbm ="";
@@ -151,7 +153,7 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
                 }else{
                     if(bizSqrEnterpriseApply.getApplyType()==1){
                         if(bizSqrEnterprise!=null){
-                            modelMap.put("error", "该企业已有承储资格，请勿重复申请");
+                            modelMap.put("error", msg);
                             return modelMap;
                         }
                     }
@@ -184,7 +186,7 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
                     if(bizSqrEnterpriseApply.getApplyType()!=4){
                         if(bizSqrEnterpriseApply.getApplyType()==1){
                             if(bizSqrEnterprise!=null){
-                                modelMap.put("error", "该企业已有承储资格，请勿重复申请");
+                                modelMap.put("error", msg);
                                 return modelMap;
                             }
                         }

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

@@ -70,6 +70,21 @@ public class FuncInfoController {
 		return pageInfo;
 	}
 
+	
+	
+	/**
+	 * 查找功能信息
+	 * @return
+	 */
+	@RequestMapping(value="/getFuncList", method = RequestMethod.GET)
+	@ApiOperation(value="功能列表", notes = "查询功能列表")
+	public List<FuncInfo> getFuncInfo() {
+		FuncInfoExample example = new FuncInfoExample();
+		Criteria criteria = example.createCriteria();
+		return funcInfoService.queryByExample(example);	
+	}
+	
+	
 	/**
 	 * 根据编号查找功能信息
 	 * @param funcId	编号