diff --git a/src/main/java/com/xujie/modules/base/controller/PropertiesController.java b/src/main/java/com/xujie/modules/base/controller/PropertiesController.java index 7dc4e0b..276a353 100644 --- a/src/main/java/com/xujie/modules/base/controller/PropertiesController.java +++ b/src/main/java/com/xujie/modules/base/controller/PropertiesController.java @@ -9,18 +9,15 @@ import com.xujie.modules.base.entity.*; import com.xujie.modules.base.service.PlmPropertiesItemAvailableService; import com.xujie.modules.base.service.PlmPropertiesItemService; -import com.xujie.modules.base.service.PropertiesGroupService; import com.xujie.modules.base.service.PropertiesService; import com.xujie.modules.sys.controller.AbstractController; import com.xujie.modules.sys.entity.DictData; -import com.xujie.modules.sys.entity.SysMenuEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; @Controller @RequestMapping(value = "/properties") @@ -31,8 +28,6 @@ public class PropertiesController extends AbstractController { private PlmPropertiesItemService propertiesItemService; @Autowired private PlmPropertiesItemAvailableService availableService; - @Autowired - private PropertiesGroupService propertiesGroupService; @@ -345,26 +340,6 @@ public class PropertiesController extends AbstractController { return R.ok(); } - @PostMapping("/menu/list") - @ResponseBody - public R searchMenuAllListId(@RequestBody PlmPropertiesModelHeader properties){ - List list = propertiesService.searchMenuAllListId(properties); - return R.ok().put("rows",list); - } - @PostMapping("/bu/list") - @ResponseBody - public R searchBUList(@RequestBody PlmPropertiesModelHeader properties){ - List list = propertiesService.searchBUList(properties); - return R.ok().put("rows",list); - } - - @PostMapping("/group/list") - @ResponseBody - public R searchPropertiesGroup(@RequestBody PlmPropertiesModelHeader properties){ - List list = propertiesGroupService.searchPropertiesGroup(properties); - return R.ok().put("rows",list.stream().map(PropertiesGroup::getMenuId).collect(Collectors.toList())); - } - @PostMapping("/item/type/list") @ResponseBody public R searchAllItemTypeList(@RequestBody PlmPropertiesItem propertiesItem){ @@ -379,12 +354,4 @@ public class PropertiesController extends AbstractController { return R.ok().put("rows",list); } - @PostMapping("/type/relationship/list") - @ResponseBody - public R searchAllTypeRelationshipList(@RequestBody PlmPropertiesModelHeader header){ - List> list = propertiesService.searchAllTypeRelationshipList(header.getFunctionType()); - return R.ok().put("rows",list); - } - - } diff --git a/src/main/java/com/xujie/modules/base/dao/PropertiesMapper.java b/src/main/java/com/xujie/modules/base/dao/PropertiesMapper.java index abe465e..d74fb65 100644 --- a/src/main/java/com/xujie/modules/base/dao/PropertiesMapper.java +++ b/src/main/java/com/xujie/modules/base/dao/PropertiesMapper.java @@ -7,7 +7,6 @@ import com.xujie.modules.base.data.*; import com.xujie.modules.base.entity.*; import com.xujie.modules.sys.entity.DictData; -import com.xujie.modules.sys.entity.SysMenuEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -244,20 +243,10 @@ public interface PropertiesMapper extends BaseMapper { void updatePlmPropertiesModelDetailOrder(PlmPropertiesModelDetail data); - - - List searchMenuAllListId(@Param("site") String site); - - List searchBUList(@Param("site") String site); - - List searchAllItemTypeList(PlmPropertiesItem propertiesItem); List> searchAllTypeList(); - List> searchAllTypeRelationshipList(@Param("type") String typeCode); - - List getItemListsForPartAndCode(PlmPropertiesModelHeaderData inData); /** * @Description TODO * @Title getItemLists @@ -279,21 +268,12 @@ public interface PropertiesMapper extends BaseMapper { * @throw */ List getModelItemLists(PlmPropertiesModelHeaderData inData); - /** - * @Description TODO - * @Title 单独插入属性 - * @param - * @author rq - * @date 2024/9/30 10:45 - * @return null - * @throw - */ + + List getItemListsForPartAndCode(PlmPropertiesModelHeaderData inData); + void saveSubPropertiesValueForAlone(PartSubPropertiesValueData inData); void deleteSubPropertiesValueForAlone(PartSubPropertiesValueData inData); - Double getNewSeqNoForAlone(PartSubPropertiesValueData inData); - - } diff --git a/src/main/java/com/xujie/modules/base/entity/PartSubPropertiesValue.java b/src/main/java/com/xujie/modules/base/entity/PartSubPropertiesValue.java index 09a2168..ec24c7e 100644 --- a/src/main/java/com/xujie/modules/base/entity/PartSubPropertiesValue.java +++ b/src/main/java/com/xujie/modules/base/entity/PartSubPropertiesValue.java @@ -150,4 +150,3 @@ public class PartSubPropertiesValue { this.valueTypeDb = valueTypeDb; } } - diff --git a/src/main/java/com/xujie/modules/base/entity/PartSubPropertiesValueHeader.java b/src/main/java/com/xujie/modules/base/entity/PartSubPropertiesValueHeader.java index d9c8cc0..623fd18 100644 --- a/src/main/java/com/xujie/modules/base/entity/PartSubPropertiesValueHeader.java +++ b/src/main/java/com/xujie/modules/base/entity/PartSubPropertiesValueHeader.java @@ -82,4 +82,3 @@ public class PartSubPropertiesValueHeader { this.recordType = recordType; } } - diff --git a/src/main/java/com/xujie/modules/base/service/Impl/PropertiesServiceImpl.java b/src/main/java/com/xujie/modules/base/service/Impl/PropertiesServiceImpl.java index c6c8afd..0b318f4 100644 --- a/src/main/java/com/xujie/modules/base/service/Impl/PropertiesServiceImpl.java +++ b/src/main/java/com/xujie/modules/base/service/Impl/PropertiesServiceImpl.java @@ -12,13 +12,12 @@ import com.xujie.modules.base.dao.PropertiesMapper; import com.xujie.modules.base.data.*; import com.xujie.modules.base.entity.*; -import com.xujie.modules.base.service.PropertiesGroupService; + import com.xujie.modules.base.service.PropertiesService; import com.xujie.modules.sys.dao.SysUserDao; import com.xujie.modules.sys.entity.DictData; -import com.xujie.modules.sys.entity.SysMenuEntity; import com.xujie.modules.sys.entity.SysUserEntity; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -37,8 +36,7 @@ public class PropertiesServiceImpl implements PropertiesService { @Autowired private PropertiesMapper propertiesMapper; - @Autowired - private PropertiesGroupService propertiesGroupService; + @@ -175,39 +173,21 @@ public class PropertiesServiceImpl implements PropertiesService { throw new RuntimeException("该模板编码已存在!"); } propertiesMapper.plmPropertiesModelSave(inData); - PropertiesGroup group = new PropertiesGroup(); - group.setSite(inData.getSite()); - group.setMenuId(inData.getGroup()); - group.setFunctionType(inData.getFunctionType()); - group.setCodeNo(inData.getCodeNo());; - group.setFunctionGroup(inData.getFunctionGroup()); - propertiesGroupService.save(group); + } @Override @Transactional public void propertiesModelEdit(PlmPropertiesModelHeaderData inData){ - propertiesGroupService.lambdaUpdate() - .eq(PropertiesGroup::getSite,inData.getSite()) - .eq(PropertiesGroup::getFunctionType,inData.getFunctionType()) - .eq(PropertiesGroup::getCodeNo,inData.getCodeNo()).remove(); + propertiesMapper.plmPropertiesModelEdit(inData); - PropertiesGroup group = new PropertiesGroup(); - group.setSite(inData.getSite()); - group.setMenuId(inData.getGroup()); - group.setFunctionType(inData.getFunctionType()); - group.setCodeNo(inData.getCodeNo()); - group.setFunctionGroup(inData.getFunctionGroup()); - propertiesGroupService.save(group); + } @Override @Transactional public void propertiesModelDelete(PlmPropertiesModelHeaderData inData){ propertiesMapper.plmPropertiesModelDelete(inData); - propertiesGroupService.lambdaUpdate() - .eq(PropertiesGroup::getSite,inData.getSite()) - .eq(PropertiesGroup::getFunctionType,inData.getFunctionType()) - .eq(PropertiesGroup::getCodeNo,inData.getCodeNo()).remove(); + } @@ -266,14 +246,6 @@ public class PropertiesServiceImpl implements PropertiesService { return propertiesMapper.getModelItemLists(inData); } - @Override - public List getItemListsForPartAndCode(PlmPropertiesModelHeaderData inData){ - return propertiesMapper.getItemListsForPartAndCode(inData); - } - - - - @Override @Transactional public void goUpItem(PlmPropertiesModelDetail inData){ @@ -303,16 +275,6 @@ public class PropertiesServiceImpl implements PropertiesService { } - @Override - public List searchMenuAllListId(PlmPropertiesModelHeader properties) { - return propertiesMapper.searchMenuAllListId(properties.getSite()); - } - - @Override - public List searchBUList(PlmPropertiesModelHeader properties) { - return propertiesMapper.searchBUList(properties.getSite()); - } - @Override public List searchAllItemTypeList(PlmPropertiesItem propertiesItem) { return propertiesMapper.searchAllItemTypeList(propertiesItem); @@ -324,11 +286,10 @@ public class PropertiesServiceImpl implements PropertiesService { } @Override - public List> searchAllTypeRelationshipList(String functionType) { - return propertiesMapper.searchAllTypeRelationshipList(functionType); + public List getItemListsForPartAndCode(PlmPropertiesModelHeaderData inData){ + return propertiesMapper.getItemListsForPartAndCode(inData); } - @Override @Transactional public void refreshPropertiesModal(PartSubPropertiesValueData inData){ @@ -340,8 +301,8 @@ public class PropertiesServiceImpl implements PropertiesService { params.add(inData.getCodeNo()); List> resultList = null; - //执行方法 - resultList = procedureDao.getProcedureData("plm_refreshPartSubPropertiesValue", params); + //执行方法 + resultList = procedureDao.getProcedureData("plm_refreshPartSubPropertiesValue", params); //判断是否成功 String code = String.valueOf(resultList.get(0).get("resultCode")); @@ -353,7 +314,7 @@ public class PropertiesServiceImpl implements PropertiesService { @Override @Transactional - public void saveSubPropertiesValueForAlone(List inData){ + public void saveSubPropertiesValueForAlone(List inData){ for (int i = 0; i getItemListsForPartAndCode(PlmPropertiesModelHeaderData inData); - /** * @Description BM属性上移 * @Title goUpItemForBM @@ -222,17 +219,12 @@ public interface PropertiesService { - List searchMenuAllListId(PlmPropertiesModelHeader properties); - - List searchBUList(PlmPropertiesModelHeader properties); - List searchAllItemTypeList(PlmPropertiesItem propertiesItem); List> searchAllTypeList(); - List> searchAllTypeRelationshipList(String functionType); - void refreshPropertiesModal(PartSubPropertiesValueData inData); + void saveSubPropertiesValueForAlone(List inData); void deleteSubPropertiesValueForAlone(List inData); diff --git a/src/main/resources/mapper/base/PropertiesMapper.xml b/src/main/resources/mapper/base/PropertiesMapper.xml index bb7a799..a1e54a9 100644 --- a/src/main/resources/mapper/base/PropertiesMapper.xml +++ b/src/main/resources/mapper/base/PropertiesMapper.xml @@ -141,18 +141,13 @@ pmh.delflag, pmh.version, pmh.is_system, - pr.function_group_desc, - pg.menu_id as [group], + pmh.function_group, pt.function_type_desc FROM plm_properties_model_header pmh - left join properties_group pg - on pg.site = pmh.site and pg.function_type = pmh.function_type and pg.code_no = pmh.code_no - left join properties_bu bu - on bu.site = pmh.site and bu.function_type = pmh.function_type and bu.code_no = pmh.code_no + left join properties_type pt on pt.function_type = pmh.function_type - left join properties_relationship pr - on pr.function_group = pmh.function_group and pr.function_type = pmh.function_type + pmh.site = #{query.site} @@ -167,19 +162,8 @@ and pmh.function_type = #{query.functionType} - - and pg.menu_id = #{query.group} - - - and pmh.function_group = #{query.functionGroup} - - - and bu.bu_no = #{query.buNo} - - - and bu.bu_no is null - + ORDER BY pmh.created_date @@ -357,20 +341,6 @@ - - - - - select menu_id, name - from sys_menu - where parent_id = 0 - and menu_id not in (999) - and menu_type = 'pc' - - - - - - - + select a.PropertiesItemNo itemNo, + b.ItemDesc + from PartSubPropertiesValue a + left join plm_properties_item b + on a.PropertiesItemNo = b.ItemNo and a.RecordType = b.ItemType and a.site = b.site + where a.CodeNo = #{codeNo} + and a.RecordType = #{functionType} + and a.site = #{site} + and a.partNo = #{partNo} - - insert into PartSubPropertiesValue ( PartNo, Site, CodeNo, SubCodeSeqNo, SubCodeDesc , ItemNo, PropertiesItemNo, TextValue, NumValue, RecordType, order_id) @@ -516,5 +471,4 @@ and RecordType = #{recordType} - \ No newline at end of file