diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java index 43178a7..855d1f3 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/ent/InListItemMapper.java @@ -2,6 +2,7 @@ package com.rzyc.mapper.ent; import com.rzyc.model.ent.InListItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.util.List; @@ -19,4 +20,7 @@ public interface InListItemMapper extends BaseMapper { List SelectContents(); + /*通过行业查询清单信息*/ + List findByIndustryId(@Param("industryId") String industryId); + } diff --git a/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml index 71762e7..e175387 100644 --- a/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/InListItemMapper.xml @@ -33,4 +33,11 @@ item_basis, item_proof, item_law, sort_id, del_state,create_time, create_by, mod select item_content from in_list_item; + + + diff --git a/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml b/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml index 7b62bf3..00143f3 100644 --- a/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/InListMapper.xml @@ -21,7 +21,7 @@ diff --git a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java index ff4bc4f..ca1c1ae 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/BaseController.java @@ -33,6 +33,7 @@ import com.rzyc.model.check.BookEntHT; import com.rzyc.model.check.ChkPerson; import com.rzyc.model.ent.*; import com.rzyc.model.user.*; +import org.apache.ibatis.annotations.Param; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.streaming.SXSSFWorkbook; @@ -464,6 +465,13 @@ public class BaseController { //任务记录 @Autowired protected TaskRecordMapper taskRecordMapper; + + //企业清单 + @Autowired + protected InEntListMapper inEntListMapper; + + + /** * 岗位不需要的字符串 */ @@ -3503,4 +3511,50 @@ public class BaseController { } } + /** + * 企业新增的时候 统一处理企业的清单信息 + * 从行业清单获取行业下的清单 分配到企业清单 + * 后期使用异步方式调用 + * + * @version v1.0 + * @author dong + * @date 2022/11/10 16:31 + */ + public void handleEntList(String entId)throws Exception{ + SysEnterprise enterprise = sysEnterpriseMapper.selectByPrimaryKey(entId); + if(null != enterprise){ + + //如果企业没有清单,则生成清单 + List entLists = inEntListMapper.selectByEnterpriseId(entId); + if(null == entLists || entLists.size() == 0){ + List listItems = inListItemMapper.findByIndustryId(enterprise.getWorkClassId()); + if(null != listItems && listItems.size() > 0){ + + for (InListItem listItem : listItems){ + InEntList entList = new InEntList(); + entList.setEntListId(RandomNumber.getUUid()); + entList.setItemId(listItem.getItemId()); + entList.setListId(listItem.getListId()); + entList.setEnterpriseId(entId); + entList.setItemTitle(listItem.getItemTitle()); + entList.setItemContent(listItem.getItemContent()); + entList.setStandard(listItem.getStandard()); + entList.setFrequency(listItem.getFrequency()); + entList.setEnclosure(listItem.getEnclosure()); + entList.setItemBasis(listItem.getItemBasis()); + entList.setItemProof(listItem.getItemProof()); + entList.setItemLaw(listItem.getItemLaw()); + entList.setSortId(listItem.getSortId()); + entList.setDelState(listItem.getDelState()); + entList.setCreateTime(new Date()); + entList.setModifyTime(new Date()); + entList.setCreateBy(""); + entList.setModifyBy(""); + inEntListMapper.insert(entList); + } + } + } + } + } + } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java index 90c4d02..df2b8c3 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCompanyController.java @@ -602,7 +602,8 @@ public class PcCompanyController extends com.rzyc.controller.BaseController { //创建或者修改企业用户 createEntUser(sysEnterprise,sysUser.getChinaname(),sysUser); - + //生成清单 + handleEntList(sysEnterprise.getSysenterpriseid()); return singleResult; }