行业清单

inventory-dao/src/main/java/com/rzyc/mapper/ent/InListMapper.java

@@ -1,8 +1,11 @@
 package com.rzyc.mapper.ent;
 
+import com.rzyc.model.ent.BaseInClass;
 import com.rzyc.model.ent.InList;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 行业清单 Mapper 接口
@@ -12,5 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2022-09-20
  */
 public interface InListMapper extends BaseMapper<InList> {
-
+    /*查询所有*/
+    List<InList> findAll();
 }

inventory-dao/src/main/java/com/rzyc/model/dto/InListDto.java

@@ -0,0 +1,42 @@
+package com.rzyc.model.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class InListDto {
+
+
+
+    @ApiModelProperty(value = "清单名")
+    private String name;
+
+    @ApiModelProperty(value = "行业清单id")
+    private String list_id;
+
+    @ApiModelProperty(value = "清单排序")
+    private Integer sort_id;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getList_id() {
+        return list_id;
+    }
+
+    public void setList_id(String list_id) {
+        this.list_id = list_id;
+    }
+
+    public Integer getSort_id() {
+        return sort_id;
+    }
+
+    public void setSort_id(Integer sort_id) {
+        this.sort_id = sort_id;
+    }
+}

inventory-dao/src/main/java/com/rzyc/model/dto/InListItemDto.java

@@ -0,0 +1,50 @@
+package com.rzyc.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class InListItemDto {
+
+    @ApiModelProperty(value = "清单项id")
+    private String item_id;
+
+    @ApiModelProperty(value = "行业清单id")
+    private String list_id;
+
+    @ApiModelProperty(value = "行业id")
+    private String industry_id;
+
+    @ApiModelProperty(value = "清单内容")
+    private String item_content;
+
+    public String getItem_content() {
+        return item_content;
+    }
+
+    public void setItem_content(String item_content) {
+        this.item_content = item_content;
+    }
+
+    public String getItem_id() {
+        return item_id;
+    }
+
+    public void setItem_id(String item_id) {
+        this.item_id = item_id;
+    }
+
+    public String getList_id() {
+        return list_id;
+    }
+
+    public void setList_id(String list_id) {
+        this.list_id = list_id;
+    }
+
+    public String getIndustry_id() {
+        return industry_id;
+    }
+
+    public void setIndustry_id(String industry_id) {
+        this.industry_id = industry_id;
+    }
+}

inventory-dao/src/main/java/com/rzyc/model/ent/InList.java

@@ -54,6 +54,7 @@ public class InList implements Serializable {
     @TableField("modify_by")
     private String modifyBy;
 
+
     public String getListId() {
         return listId;
     }

inventory-dao/src/main/resources/mapper/ent/InListMapper.xml

@@ -19,4 +19,10 @@
         list_id, name, sort_id,del_state, create_time, create_by, modify_time, modify_by
     </sql>
 
+    <!--查询清单列-->
+    <select id="findAll" resultMap="BaseResultMap">
+        select * from in_list
+    </select>
+
+
 </mapper>

inventory-gov/src/main/java/com/rzyc/controller/BaseController.java

@@ -268,7 +268,7 @@ public class BaseController {
     @Autowired
     protected SysRoleResourceMapper sysRoleResourceMapper;
 
-    //请求对象
+    //浏览器对象
     @Autowired
     protected HttpServletRequest request;
 
@@ -336,6 +336,10 @@ public class BaseController {
     @Autowired
     protected IndustryWorkMapper industryWorkMapper;
 
+//    //企业监管用户
+//    @Autowired
+//    protected EntUserMapper entUserMapper;
+
     //责任树
     @Autowired
     protected DutyTreeMapper dutyTreeMapper;
@@ -444,6 +448,16 @@ public class BaseController {
     @Autowired
     protected SysDocumenttempMapper sysDocumenttempMapper;
 
+    //企业清单
+    @Autowired
+    protected InListMapper inListMapper;
+
+    //所属清单项
+    @Autowired
+    protected InListItemMapper inListItemMapper;
+
+    //
+
     /**
      * 岗位不需要的字符串
      */

inventory-gov/src/main/java/com/rzyc/controller/IndustryListController.java

@@ -0,0 +1,143 @@
+package com.rzyc.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.common.utils.model.MultiResult;
+import com.common.utils.model.SingleResult;
+import com.rzyc.mapper.ent.InListMapper;
+import com.rzyc.model.dto.InListDto;
+import com.rzyc.model.dto.InListItemDto;
+import com.rzyc.model.ent.BaseInClass;
+import com.rzyc.model.ent.InList;
+import com.rzyc.model.ent.InListItem;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.service.ApiListing;
+
+import javax.swing.*;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Api(tags = "行业清单")
+@CrossOrigin("*")
+@RequestMapping("industryList")
+@Validated
+@RestController
+public class IndustryListController extends BaseController{
+
+    /**
+     * 父级行业列表
+     * @return
+     */
+    @ApiOperation(value = "父级行业列表", notes = "行业清单列表")
+    @PostMapping("/selectIndustry")
+    @ResponseBody
+    public MultiResult<String> selectIndustry(){
+
+        MultiResult<String> result = new MultiResult<>();
+        ArrayList<String> nameList = new ArrayList<>();
+        List<BaseInClass> baseInClassList = baseInClassMapper.findAll();
+        for (BaseInClass baseInClass : baseInClassList) {
+            String industryClassName = baseInClass.getIndustryclassname();
+            nameList.add(industryClassName);
+        }
+        result.setData(nameList);
+        return result;
+    }
+
+
+    /**
+     * 查询行业清单
+     * @param
+     * @return
+     * @throws Exception
+     */
+
+    @ApiOperation(value = "行业清单列表", notes = "行业清单列表")
+    @PostMapping("/industryListSelect")
+    @ResponseBody
+    public MultiResult<String> industryListSelect(@Valid @RequestBody BaseInClass baseInClass)throws Exception{
+        MultiResult<String> result = new MultiResult<>();
+        ArrayList<String> nameList = new ArrayList<>();
+        LambdaQueryWrapper<InList> lqw = new LambdaQueryWrapper<>();
+        //lqw.eq(InList::,)
+        List<InList> inLists = inListMapper.findAll();
+        if(inLists.size() > 0){
+            for (InList inList : inLists) {
+                String name = inList.getName();
+                nameList.add(name);
+            }
+        }
+        result.setData(nameList);
+        return result;
+    }
+
+
+
+    /**
+     * 新增清单列
+     * @param inListDto
+     * @return
+     */
+    @ApiOperation(value = "新增清单列", notes = "新增清单列")
+    @PostMapping("/addInList")
+    @ResponseBody
+    public SingleResult<String> addInList(@Valid @RequestBody InListDto inListDto){
+        InList inList = inListMapper.selectById(inListDto.getList_id());
+        if(inList == null){
+            InList addInList = new InList();
+            BeanUtils.copyProperties(addInList,inListDto);
+            addInList.setCreateTime(new Date());
+            //addInList.getCreateBy(getUserId())
+        }
+        return new SingleResult<String>();
+    }
+
+
+
+
+    /**
+     * 查询行业清单的所属清单项
+     * @param inListDto
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation(value = "所属清单项列表", notes = "所属清单项列表")
+    @PostMapping("/industryListItemSelect")
+    @ResponseBody
+    public MultiResult<String> industryListItemSelect(@RequestBody InListDto inListDto)throws Exception{
+        MultiResult<String> result = new MultiResult<>();
+        ArrayList<String> contentList = new ArrayList<>();
+        LambdaQueryWrapper<InListItem> lambdaQueryWrapper = new LambdaQueryWrapper();
+        LambdaQueryWrapper<InListItem> queryWrapper = lambdaQueryWrapper
+                .eq(InListItem::getListId, inListDto.getList_id());
+        List<InListItem> inListItems = inListItemMapper.selectList(queryWrapper);
+        for (InListItem inListItem : inListItems) {
+            String itemContent = inListItem.getItemContent();
+            contentList.add(itemContent);
+        }
+        result.setData(contentList);
+        return result;
+    }
+
+    /**
+     * 删除清单项
+     * @param inListItemDto
+     * @return
+     */
+    @ApiOperation(value = "删除清单项", notes = "删除清单项")
+    @PostMapping("/deleteInListItem")
+    @ResponseBody
+    public SingleResult<String> deleteInListItem(@Valid @RequestBody InListItemDto inListItemDto){
+        inListItemMapper.deleteById(inListItemDto.getItem_id());
+        return new SingleResult<String>();
+    }
+
+
+
+}

inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java

@@ -1721,6 +1721,30 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
         }
         return result;
     }*/
+//    /**
+//     * 任务详情
+//     * @param taskDetailDto
+//     * @return
+//     * @throws Exception
+//     */
+//    @LoginAuth
+//    @ApiOperation(value = "任务详情", notes = "任务详情")
+//    @PostMapping(value = "taskDetail")
+//    @ResponseBody
+//    public SingleResult<OATask> taskDetail(@Valid TaskDetailDto taskDetailDto)throws Exception{
+//        SingleResult<OATask> result = new SingleResult<>();
+//        OATask oaTask = oaTaskMapper.taskDetail(taskDetailDto.getTaskId(),taskDetailDto.getUserId());
+//        if(null != oaTask){
+//            //任务详情处理
+//            getTaskDetail(oaTask,taskDetailDto.getUserId());
+//            handleTaskDetail(oaTask);
+//            result.setData(oaTask);
+//        }else{
+//            result.setCode(Code.NO_DATA.getCode());
+//            result.setMessage(Message.NO_DATA);
+//        }
+//        return result;
+//    }
 
     /**
      * 认证日志分页

inventory-gov/src/main/resources/application-prod.yml

@@ -90,6 +90,7 @@ onstants:
   word_tmp: /mnt/rzyc/resource/inventory/wordtmp
 
 
+
 #加密
 jasypt:
   encryptor: