修改审批接口

sxz-core/src/main/java/com/fdkk/sxz/other/listener/SnycBuild.java

@@ -70,7 +70,7 @@ public class SnycBuild {
                     //普通
                     renovationPartsDetailEntity = renovationPartsDetailService.findById(id);
                     if (ObjectUtil.isNotNull(renovationPartsDetailEntity)) {
-                        renovationPartsDetailEntity.setExamine(2);
+                        renovationPartsDetailEntity.setExamine(1);
                         renovationPartsDetailEntity.setExamineTime(new Date());
                         renovationPartsDetailService.updateById(renovationPartsDetailEntity);
                     }
@@ -79,7 +79,7 @@ public class SnycBuild {
                     //定制
                     customProductEntity = customProductService.findById(id);
                     if (ObjectUtil.isNotNull(customProductEntity)) {
-                        customProductEntity.setExamine(2);
+                        customProductEntity.setExamine(1);
                         customProductEntity.setExamineTime(new Date());
                         customProductService.updateById(customProductEntity);
                     }
@@ -88,7 +88,7 @@ public class SnycBuild {
                     //组件
                     componentEntity = customComponentService.findById(id);
                     if (ObjectUtil.isNotNull(componentEntity)) {
-                        componentEntity.setExamine(2);
+                        componentEntity.setExamine(1);
                         componentEntity.setExamineTime(new Date());
                         customComponentService.updateById(componentEntity);
                     }

sxz-core/src/main/java/com/fdkk/sxz/webApi/controller/ManagerController.java

@@ -795,7 +795,7 @@ public class ManagerController extends BaseController {
             for (Long id : param.getIds()) {
                 RenovationPartsDetailEntity renovationPartsDetailEntity = renovationPartsDetailService.findById(id);
                 renovationPartsDetailEntity.setId(id);
-                renovationPartsDetailEntity.setExamine(1);
+                renovationPartsDetailEntity.setExamine(2);
                 ModelUploadEntity modelUploadEntity = modelUploadService.findByPartsDetailId(id);
                 if (ObjectUtil.isNotNull(modelUploadEntity)) {
                     //入库前先提交模型到模型库，失败返回提示

sxz-core/src/main/java/com/fdkk/sxz/webApi/mapper/IRenovationPartsDetailMapper.java

@@ -21,7 +21,7 @@ public interface IRenovationPartsDetailMapper extends IBaseMapper<RenovationPart
     @Select("<script>" +
             "select id, key_word as keyWord, type, description, img, high_img as highImg, path, name, zh_name as zhName, parts_type_id as partsTypeId, has_toolbag as hasToolbag ,mview_path as " +
             "mviewPath , other_file_url as  otherFileUrl " +
-            "from tb_renovation_parts_detail where parts_type_id = #{partsTypeId} and rec_status = 'A' and is_show = 1 and examine = 2" +
+            "from tb_renovation_parts_detail where parts_type_id = #{partsTypeId} and rec_status = 'A' and is_show = 1 and examine = 1" +
             "<if test= 'colorId != null'> " +
             " and parts_color_id = #{colorId} " +
             "</if> " +
@@ -38,7 +38,7 @@ public interface IRenovationPartsDetailMapper extends IBaseMapper<RenovationPart
 
     @Select("select id,parts_type_id AS partsTypeId, key_word as keyWord, type, description, img, high_img as highImg, path, name, zh_name as zhName, has_toolbag as hasToolbag ,mview_path as " +
             "mviewPath ,other_file_url as  otherFileUrl from " +
-            "tb_renovation_parts_detail where key_word like CONCAT('%', #{keyWord}, '%') and rec_status = 'A' and is_show = 1 and examine = 2 ")
+            "tb_renovation_parts_detail where key_word like CONCAT('%', #{keyWord}, '%') and rec_status = 'A' and is_show = 1 and examine = 1 ")
     List<ResponseRenovationPartsDetail> findByKeyWord(String keyWord);
 
     @Select("<script> " +

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

@@ -120,7 +120,7 @@ public class CustomComponentServiceImpl extends BaseServiceImpl<ICustomComponent
         if (ObjectUtil.isNotNull(param.getParentId())) {
             wrapper.eq(CustomComponentEntity::getComponentTypeId, param.getParentId());
         }
-        wrapper.eq(CustomComponentEntity::getExamine, 2);
+        wrapper.eq(CustomComponentEntity::getExamine, 1);
         wrapper.eq(CustomComponentEntity::getIsShow, 1);
         return list(wrapper).stream().map(a -> {
             ResponseCustomComponent customComponent = new ResponseCustomComponent();
@@ -141,7 +141,7 @@ public class CustomComponentServiceImpl extends BaseServiceImpl<ICustomComponent
             for (Long id : param.getIds()) {
                 CustomComponentEntity componentEntity = findById(id);
                 if (ObjectUtil.isNotNull(componentEntity)) {
-                    componentEntity.setExamine(1);
+                    componentEntity.setExamine(2);
                     ComponentModelUploadEntity modelUploadEntity = componentModelUploadService.findByPartsDetailId(componentEntity.getId());
                     if (ObjectUtil.isNotNull(modelUploadEntity)) {
                         //入库前先提交模型到模型库，失败返回提示

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

@@ -110,7 +110,7 @@ public class CustomProductServiceImpl extends BaseServiceImpl<ICustomProductMapp
             wrapper.eq(CustomProductEntity::getParentId, param.getParentId());
         }
         wrapper.eq(CustomProductEntity::getIsShow, 1);
-        wrapper.eq(CustomProductEntity::getExamine, 2);
+        wrapper.eq(CustomProductEntity::getExamine, 1);
         List<CustomProductEntity> list = this.list(wrapper);
         List<ResponseCustomProduct> bList = list.stream().map(a -> {
             //在此转把A转换为B
@@ -159,7 +159,7 @@ public class CustomProductServiceImpl extends BaseServiceImpl<ICustomProductMapp
         if (!CollectionUtils.isEmpty(param.getIds())) {
             for (Long id : param.getIds()) {
                 CustomProductEntity customProductEntity = findById(id);
-                customProductEntity.setExamine(1);
+                customProductEntity.setExamine(2);
                 customProductEntity.setExamineTime(new Date());
                 boolean updateFlag = updateById(customProductEntity);
                 JSONArray syncDataArray = new JSONArray();
@@ -180,7 +180,7 @@ public class CustomProductServiceImpl extends BaseServiceImpl<ICustomProductMapp
                                 object.put("ObjAliPath", "domain/eHome/furniture/simpleObj-Mtl/" + componentModelUploadEntity.getFileId());
                                 syncDataArray.add(object);
                             }
-                            componentEntity.setExamine(1);
+                            componentEntity.setExamine(2);
                             componentEntity.setExamineTime(new Date());
                             customComponentService.updateById(componentEntity);
                         }