定制组件增加审批通过条件

sxz-core/src/main/java/com/fdkk/sxz/webApi/service/custom/impl/CustomComponentServiceImpl.java

@@ -16,6 +16,7 @@ import com.fdkk.sxz.webApi.service.custom.ICustomComponentService;
 import com.github.pagehelper.PageInfo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -29,6 +30,7 @@ import java.util.stream.Collectors;
 @Service
 public class CustomComponentServiceImpl extends BaseServiceImpl<ICustomComponentMapper, CustomComponentEntity> implements ICustomComponentService {
 
+    @Qualifier("ICustomComponentMapper")
     @Autowired
     private ICustomComponentMapper customComponentMapper;
 
@@ -77,6 +79,7 @@ public class CustomComponentServiceImpl extends BaseServiceImpl<ICustomComponent
         if (ObjectUtil.isNotNull(param.getParentId())){
             wrapper.eq(CustomComponentEntity::getComponentTypeId,param.getParentId());
         }
+        wrapper.eq(CustomComponentEntity::getExamine,1);
         wrapper.eq(CustomComponentEntity::getIsShow,1);
         return list(wrapper).stream().map(a ->{
             ResponseCustomComponent customComponent=new ResponseCustomComponent();

sxz-core/src/main/java/com/fdkk/sxz/webApi/service/custom/impl/CustomProductServiceImpl.java

@@ -71,6 +71,7 @@ public class CustomProductServiceImpl extends BaseServiceImpl<ICustomProductMapp
               wrapper.eq(CustomProductEntity::getParentId,param.getParentId());
           }
         wrapper.eq(CustomProductEntity::getIsShow,1);
+        wrapper.eq(CustomProductEntity::getExamine,1);
         List<CustomProductEntity> list= this.list(wrapper);
         List<ResponseCustomProduct> bList = list.stream().map(a ->{
             //在此转把A转换为B

sxz-core/src/main/java/com/fdkk/sxz/webApi/service/impl/RenovationPartsDetailServiceImpl.java

@@ -10,6 +10,7 @@ import com.fdkk.sxz.webApi.mapper.IRenovationPartsSizeMapper;
 import com.fdkk.sxz.webApi.service.IRenovationPartsDetailService;
 import com.fdkk.sxz.vo.response.ResponseRenovationPartsDetail;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,12 +23,15 @@ import java.util.List;
 @Transactional
 public class RenovationPartsDetailServiceImpl extends BaseServiceImpl<IRenovationPartsDetailMapper, RenovationPartsDetailEntity> implements IRenovationPartsDetailService {
 
+    @Qualifier("IRenovationPartsDetailMapper")
     @Autowired
     private IRenovationPartsDetailMapper mapper;
 
+    @Qualifier("IRenovationPartsAttachingMapper")
     @Autowired
     private IRenovationPartsAttachingMapper renovationPartsAttachingMapper;
 
+    @Qualifier("IRenovationPartsSizeMapper")
     @Autowired
     private IRenovationPartsSizeMapper renovationPartsSizeMapper;
 

sxz-modules/src/main/java/com/fdkk/sxz/vo/request/RequestCustom.java

@@ -23,4 +23,5 @@ public class RequestCustom extends RequestBase {
     @ApiModelProperty(value = "父节点id", name = "parentId")
     private Long parentId;
 
+    private Integer examine;
 }