Merge branch 'master' of https://git.steerinfo.com/XTEMS/xt-ems-api

src/main/java/com/steerinfo/ems/trmmaterial/controller/TRmMaterialController.java

@@ -128,7 +128,7 @@ public class TRmMaterialController extends BaseRESTfulController {
                 continue;
             }
             LOGGER.info("原材料信息维护要删除的第" + (i + 1) + "条数据是" + tRmMaterialService.getById(Ids.get(i)).toString());
-            tRmMaterialService.delete(Ids.get(0));
+            tRmMaterialService.delete(Ids.get(i));
         }
         if(failnum > 0){
             LOGGER.info(JwtUtil.getUseridByToken() + "本次共删除" + Ids.size() + "条数据,其中成功" + (Ids.size() - failnum) + "条,失败" + failnum + "条,失败的数据id:" + failid.toString());

src/main/java/com/steerinfo/ftp/securitytype/controller/SecurityTypeController.java

@@ -14,10 +14,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * SecurityType RESTful接口：
@@ -58,8 +56,30 @@ public class SecurityTypeController extends BaseRESTfulController {
     })
     //@RequiresPermissions("securitytype:view")
     @GetMapping(value = "/like/")
-    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize,String[] Info){
         PageList<SecurityType> list = securityTypeService.queryLikeForPage(parmas, pageNum, pageSize);
+        //在前端已经判断过权限，后端保险，后期服务器压力大可以注释
+        List<String> infoList = Arrays.asList(Info);
+        List<SecurityType> securityTypeList= new ArrayList<>();
+        Integer total = 0;
+        for (int i = 0;i < list.getList().size();i++){
+            SecurityType securityInfo = (SecurityType) list.getList().get(i);
+            if (securityInfo.getSecurityInfo() != null && !"".equals(securityInfo.getSecurityInfo())) {
+                List<String> infoList2= Arrays.asList(securityInfo.getSecurityInfo().split(",")
+                ).stream().map(s -> (s.trim())).collect(Collectors.toList());
+                infoList2.retainAll(infoList);
+                if (infoList2.size()>0){
+                    securityTypeList.add(securityInfo);
+                }else{
+                    total++;
+                }
+                continue;
+            }
+            securityTypeList.add(securityInfo);
+            continue;
+        }
+        list.setList(securityTypeList);
+        list.setTotal(list.getTotal()-total);
         return success(list);
     }
     
@@ -139,6 +159,12 @@ public class SecurityTypeController extends BaseRESTfulController {
     	List<String> list = Arrays.asList(id.split(","));
     	if(ListUtils.isNotEmpty(list)) {
 	    	List<String> ids = ListUtils.convertList(list);
+            for (int i = 0; i < ids.size(); i++) {
+                if(securityTypeService.getParentNum(ids.get(i))>0)
+                {
+                    return failed(null, "所选分类存在子级，请先删除子级分类");
+                }
+            }
 			  securityTypeService.delete(ids);
     	}
       return success();
@@ -155,11 +181,17 @@ public class SecurityTypeController extends BaseRESTfulController {
     @GetMapping(value = "/gettree/")
     public RESTfulResult getTree(@RequestParam HashMap parameters){
         TreeUtils treeUtils = new TreeUtils();
-        List<SecurityType> list = securityTypeService.getTree(parameters);
-        return success(treeUtils.getTreeData(list));
+        String[] securityInfo =parameters.get("securityInfo").toString().split(",");
+        List<SecurityType> lists = securityTypeService.getTree();
+        for (int i = 0; i <securityInfo.length; i++) {
+        List<SecurityType> list = securityTypeService.getTreeByInfo(securityInfo[i]);
+        lists.removeAll(list);
+        lists.addAll(list);
+        }
+        return success(treeUtils.getTreeData(lists));
     }
 
-    @ApiOperation(value = "查询下拉框的值",notes = "根据 namd 和 id 来显示，可传参数ISSETTLE（列入结算）,ISREAL（列入实绩）,ISPLAN（列入计划）,ISBALANCE（列入平衡表）,HASPRODUCT（是否产出）")
+    @ApiOperation(value = "查询下拉框的值",notes = "根据 namd 和 id 来显示")
     @GetMapping("/getIdAndName")
     public RESTfulResult getIdAndName(@RequestParam HashMap<String, Object> parmas){
         if(parmas.get("id") != null && !parmas.get("id").toString().isEmpty()){

src/main/java/com/steerinfo/ftp/securitytype/mapper/SecurityTypeMapper.java

@@ -9,7 +9,9 @@ import java.util.Map;
 
 @Mapper
 public interface SecurityTypeMapper extends IBaseMapper<SecurityType, String> {
-    List<SecurityType> getTree(Map<String, Object> parameters);
+    List<SecurityType> getTree();
+
+    List<SecurityType> getTreeByInfo(String securityInfo);
 
     List<SecurityType> getParent();
 
@@ -18,4 +20,6 @@ public interface SecurityTypeMapper extends IBaseMapper<SecurityType, String> {
     Integer getMaxSeqNo();
 
     String getURL(String parentId);
+
+    Integer getParentNum(String Id);
 }

src/main/java/com/steerinfo/ftp/securitytype/mapper/SecurityTypeMapper.xml

@@ -393,8 +393,17 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <select id="getTree" resultMap="BaseResultMap">
+    select ID, SECURITY_NAME, SECURITY_PARENTID, SECURITY_NODE from SECURITY_TYPE
+    WHERE 1=1 and SECURITY_INFO is null OR SECURITY_INFO = ''
+    order by SEQNO
+  </select>
+
+  <select id="getTreeByInfo" parameterType="java.lang.String" resultMap="BaseResultMap">
     select ID, SECURITY_NAME, SECURITY_PARENTID, SECURITY_NODE from SECURITY_TYPE
     WHERE 1=1
+<!--      <if test="securityInfo != null and securityInfo != ''">-->
+      AND SECURITY_INFO like '%'||#{securityInfo}||'%'
+<!--      </if>-->
     order by SEQNO
   </select>
 
@@ -418,4 +427,9 @@
   <select id="getURL" resultType="java.lang.String" parameterType="java.lang.String">
     SELECT SECURITY_UPLOAD_URL FROM SECURITY_TYPE where ID=#{parentId}
   </select>
+
+  <!--查找子级-->
+  <select id="getParentNum" resultType="java.lang.Integer" parameterType="java.lang.String">
+    SELECT COUNT(SECURITY_PARENTID) FROM SECURITY_TYPE WHERE SECURITY_PARENTID=#{Id}
+  </select>
 </mapper>

src/main/java/com/steerinfo/ftp/securitytype/model/SecurityType.java

@@ -17,7 +17,7 @@ public class SecurityType implements IBasePO<String>, TreePO<String, String, Sec
     private String id;
 
     /**
-     * 信息类别(SECURITY_TYPE,VARCHAR,10)
+     * 信息类别(SECURITY_TYPE,VARCHAR,100)
      */
     @ApiModelProperty(value="信息类别",required=false)
     private String securityType;
@@ -41,7 +41,7 @@ public class SecurityType implements IBasePO<String>, TreePO<String, String, Sec
     private Long seqno;
 
     /**
-     * 上层节点(SECURITY_PARENTID,VARCHAR,10)
+     * 上层节点(SECURITY_PARENTID,VARCHAR,200)
      */
     @ApiModelProperty(value="上层节点",required=false)
     private String securityParentid;

src/main/java/com/steerinfo/ftp/securitytype/service/ISecurityTypeService.java

@@ -20,7 +20,9 @@ import java.util.Map;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface ISecurityTypeService extends IBaseService<SecurityType, String>{
-    List<SecurityType> getTree(Map<String, Object> parameters);
+    List<SecurityType> getTree();
+
+    List<SecurityType> getTreeByInfo(String securityInfo);
 
     List<SecurityType> getParent();
 
@@ -29,4 +31,6 @@ public interface ISecurityTypeService extends IBaseService<SecurityType, String>
     Integer getMaxSeqNo();
 
     String getURL(String parentId);
+
+    Integer getParentNum(String parentId);
 }

src/main/java/com/steerinfo/ftp/securitytype/service/impl/SecurityTypeServiceImpl.java

@@ -36,8 +36,14 @@ public class SecurityTypeServiceImpl extends BaseServiceImpl<SecurityType, Strin
     }
 
     @Override
-    public List<SecurityType> getTree(Map<String, Object> parameters){
-        List<SecurityType> rows = securityTypeMapper.getTree(parameters);
+    public List<SecurityType> getTree(){
+        List<SecurityType> rows = securityTypeMapper.getTree();
+        return rows;
+    }
+
+    @Override
+    public List<SecurityType> getTreeByInfo(String securityInfo) {
+        List<SecurityType> rows = securityTypeMapper.getTreeByInfo(securityInfo);
         return rows;
     }
 
@@ -61,4 +67,9 @@ public class SecurityTypeServiceImpl extends BaseServiceImpl<SecurityType, Strin
     public String getURL(String parentId) {
         return securityTypeMapper.getURL(parentId);
     }
+
+    @Override
+    public Integer getParentNum(String parentId) {
+        return securityTypeMapper.getParentNum(parentId);
+    }
 }