清运单审核

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/RecycleCleanOrderMapper.xml

@@ -2,6 +2,27 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="jnpf.mapper.RecycleCleanOrderMapper">
 
+    <update id="auditBatch">
+        UPDATE NX_RECYCLE_CLEAN_ORDER
+        SET
+<!--        <choose>-->
+<!--            <when test="batch.auditStatus == 1">-->
 
+<!--            </when>-->
+<!--            <otherwise>-->
 
+<!--            </otherwise>-->
+<!--        </choose>-->
+        ADJUST_WEIGHT = WEIGHT,
+        ADJUST_PRICE = TOTAL_PRICE,
+        ADJUST_STATUS = #{batch.adjustStatus},
+        ADJUST_COMM = #{batch.adjustComm},
+        ENTRY_STATUS = #{batch.entryStatus},
+        F_LAST_MODIFY_TIME = #{batch.lastModifyTime},
+        F_LAST_MODIFY_USER_ID = #{batch.lastModifyUserId}
+        WHERE ID IN
+        <foreach collection="batch.ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 </mapper>

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/CompanyMapper.java

@@ -0,0 +1,7 @@
+package jnpf.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import jnpf.entity.CompanyEntity;
+
+public interface CompanyMapper extends BaseMapper<CompanyEntity> {
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleCleanOrderMapper.java

@@ -3,6 +3,8 @@ package jnpf.mapper;
 
 import jnpf.entity.RecycleCleanOrderEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import jnpf.model.recyclecleanorder.CleanAuditBatch;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 清运清单
@@ -12,5 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 日期： 2024-06-18
  */
 public interface RecycleCleanOrderMapper extends BaseMapper<RecycleCleanOrderEntity> {
-
+    int auditBatch(@Param("batch") CleanAuditBatch batch);
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/CompanyService.java

@@ -0,0 +1,15 @@
+package jnpf.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import jnpf.entity.CompanyEntity;
+
+import java.math.BigDecimal;
+
+public interface CompanyService extends IService<CompanyEntity> {
+
+    //结算
+    boolean settlement(String companyId, String orderNo, BigDecimal amount);
+
+    //退款
+    boolean refund(String companyId,String orderNo, BigDecimal amount);
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/RecycleCleanOrderService.java

@@ -30,6 +30,9 @@ public interface RecycleCleanOrderService extends IService<RecycleCleanOrderEnti
     //副表数据方法
 	String checkForm(RecycleCleanOrderForm form,int i);
 
+    boolean audit(CleanAuditForm form);
+    Integer auditBatch(CleanAuditBatch batch);
+
     void saveOrUpdate(RecycleCleanOrderForm recycleCleanOrderForm,String id, boolean isSave) throws Exception;
 
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CompanyServiceImpl.java

@@ -0,0 +1,27 @@
+package jnpf.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.entity.CompanyEntity;
+import jnpf.mapper.CompanyMapper;
+import jnpf.service.CompanyService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+
+@Service
+public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, CompanyEntity> implements CompanyService {
+
+    @Resource
+    private CompanyMapper companyMapper;
+
+    @Override
+    public boolean settlement(String companyId, String orderNo, BigDecimal amount) {
+        return false;
+    }
+
+    @Override
+    public boolean refund(String companyId, String orderNo, BigDecimal amount) {
+        return false;
+    }
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCleanOrderServiceImpl.java

@@ -1,22 +1,32 @@
 package jnpf.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import jnpf.entity.*;
 import jnpf.mapper.RecycleCleanOrderMapper;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.recyclecleanorder.*;
+
 import java.math.BigDecimal;
+
 import cn.hutool.core.util.ObjectUtil;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.util.GeneraterSwapUtil;
 import jnpf.database.model.superQuery.SuperQueryJsonModel;
 import jnpf.database.model.superQuery.ConditionJsonModel;
 import jnpf.database.model.superQuery.SuperQueryConditionModel;
+
 import java.lang.reflect.Field;
+
 import com.baomidou.mybatisplus.annotation.TableField;
+
+import java.time.LocalDateTime;
 import java.util.regex.Pattern;
+
 import jnpf.model.QueryModel;
+
 import java.util.stream.Collectors;
+
 import jnpf.base.model.ColumnDataModel;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,13 +35,19 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import java.text.SimpleDateFormat;
+
 import jnpf.util.*;
+
 import java.util.*;
+
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
+import javax.annotation.Resource;
+
 /**
- *
  * 清运清单
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@@ -39,239 +55,288 @@ import jnpf.permission.entity.UserEntity;
  * 日期： 2024-06-18
  */
 @Service
-public class RecycleCleanOrderServiceImpl extends ServiceImpl<RecycleCleanOrderMapper, RecycleCleanOrderEntity> implements RecycleCleanOrderService{
+public class RecycleCleanOrderServiceImpl extends ServiceImpl<RecycleCleanOrderMapper, RecycleCleanOrderEntity> implements RecycleCleanOrderService {
     @Autowired
     private GeneraterSwapUtil generaterSwapUtil;
 
     @Autowired
     private UserProvider userProvider;
 
+    @Resource
+    private RecycleCleanOrderMapper cleanOrderMapper;
+
     @Override
-    public List<RecycleCleanOrderEntity> getList(RecycleCleanOrderPagination recycleCleanOrderPagination){
-        return getTypeList(recycleCleanOrderPagination,recycleCleanOrderPagination.getDataType());
+    public List<RecycleCleanOrderEntity> getList(RecycleCleanOrderPagination recycleCleanOrderPagination) {
+        return getTypeList(recycleCleanOrderPagination, recycleCleanOrderPagination.getDataType());
     }
-    /** 列表查询 */
+
+    /**
+     * 列表查询
+     */
     @Override
-    public List<RecycleCleanOrderEntity> getTypeList(RecycleCleanOrderPagination recycleCleanOrderPagination,String dataType){
-        String userId=userProvider.get().getUserId();
-        List<String> AllIdList =new ArrayList();
-        List<List<String>> intersectionList =new ArrayList<>();
+    public List<RecycleCleanOrderEntity> getTypeList(RecycleCleanOrderPagination recycleCleanOrderPagination, String dataType) {
+        String userId = userProvider.get().getUserId();
+        List<String> AllIdList = new ArrayList();
+        List<List<String>> intersectionList = new ArrayList<>();
         boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         String columnData = !isPc ? RecycleCleanOrderConstant.getAppColumnData() : RecycleCleanOrderConstant.getColumnData();
         ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
         String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
 
-        int total=0;
-        int recycleCleanOrderNum =0;
-        QueryWrapper<RecycleCleanOrderEntity> recycleCleanOrderQueryWrapper=new QueryWrapper<>();
+        int total = 0;
+        int recycleCleanOrderNum = 0;
+        QueryWrapper<RecycleCleanOrderEntity> recycleCleanOrderQueryWrapper = new QueryWrapper<>();
         List<String> allSuperIDlist = new ArrayList<>();
-        String superOp ="";
-        if (ObjectUtil.isNotEmpty(recycleCleanOrderPagination.getSuperQueryJson())){
+        String superOp = "";
+        if (ObjectUtil.isNotEmpty(recycleCleanOrderPagination.getSuperQueryJson())) {
             List<String> allSuperList = new ArrayList<>();
-            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            List<List<String>> intersectionSuperList = new ArrayList<>();
             String queryJson = recycleCleanOrderPagination.getSuperQueryJson();
             SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
             int superNum = 0;
             QueryWrapper<RecycleCleanOrderEntity> recycleCleanOrderSuperWrapper = new QueryWrapper<>();
-            recycleCleanOrderSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleCleanOrderSuperWrapper,RecycleCleanOrderEntity.class,queryJson,"0"));
+            recycleCleanOrderSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleCleanOrderSuperWrapper, RecycleCleanOrderEntity.class, queryJson, "0"));
             int recycleCleanOrderNum1 = recycleCleanOrderSuperWrapper.getExpression().getNormal().size();
-            if (recycleCleanOrderNum1>0){
-                List<String> recycleCleanOrderList =this.list(recycleCleanOrderSuperWrapper).stream().map(RecycleCleanOrderEntity::getId).collect(Collectors.toList());
+            if (recycleCleanOrderNum1 > 0) {
+                List<String> recycleCleanOrderList = this.list(recycleCleanOrderSuperWrapper).stream().map(RecycleCleanOrderEntity::getId).collect(Collectors.toList());
                 allSuperList.addAll(recycleCleanOrderList);
                 intersectionSuperList.add(recycleCleanOrderList);
                 superNum++;
             }
             superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
             //and or
-            if(superOp.equalsIgnoreCase("and")){
+            if (superOp.equalsIgnoreCase("and")) {
                 allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
-            }else{
+            } else {
                 allSuperIDlist = allSuperList;
             }
         }
         List<String> allRuleIDlist = new ArrayList<>();
-        String ruleOp ="";
-        if (ObjectUtil.isNotEmpty(ruleJson)){
+        String ruleOp = "";
+        if (ObjectUtil.isNotEmpty(ruleJson)) {
             List<String> allRuleList = new ArrayList<>();
-            List<List<String>> intersectionRuleList  = new ArrayList<>();
+            List<List<String>> intersectionRuleList = new ArrayList<>();
             SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
             int ruleNum = 0;
             QueryWrapper<RecycleCleanOrderEntity> recycleCleanOrderSuperWrapper = new QueryWrapper<>();
-            recycleCleanOrderSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleCleanOrderSuperWrapper,RecycleCleanOrderEntity.class,ruleJson,"0"));
+            recycleCleanOrderSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleCleanOrderSuperWrapper, RecycleCleanOrderEntity.class, ruleJson, "0"));
             int recycleCleanOrderNum1 = recycleCleanOrderSuperWrapper.getExpression().getNormal().size();
-            if (recycleCleanOrderNum1>0){
-                List<String> recycleCleanOrderList =this.list(recycleCleanOrderSuperWrapper).stream().map(RecycleCleanOrderEntity::getId).collect(Collectors.toList());
+            if (recycleCleanOrderNum1 > 0) {
+                List<String> recycleCleanOrderList = this.list(recycleCleanOrderSuperWrapper).stream().map(RecycleCleanOrderEntity::getId).collect(Collectors.toList());
                 allRuleList.addAll(recycleCleanOrderList);
                 intersectionRuleList.add(recycleCleanOrderList);
                 ruleNum++;
             }
             ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
             //and or
-            if(ruleOp.equalsIgnoreCase("and")){
+            if (ruleOp.equalsIgnoreCase("and")) {
                 allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
-            }else{
+            } else {
                 allRuleIDlist = allRuleList;
             }
         }
-    boolean pcPermission = true;
-    boolean appPermission = false;
-    if(isPc && pcPermission){
-    if (!userProvider.get().getIsAdministrator()){
-        Object recycleCleanOrderObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleCleanOrderQueryWrapper,RecycleCleanOrderEntity.class,recycleCleanOrderPagination.getMenuId(),"0"));
-        if (ObjectUtil.isEmpty(recycleCleanOrderObj)){
-        return new ArrayList<>();
-        } else {
-        recycleCleanOrderQueryWrapper = (QueryWrapper<RecycleCleanOrderEntity>)recycleCleanOrderObj;
-        if( recycleCleanOrderQueryWrapper.getExpression().getNormal().size()>0){
-        recycleCleanOrderNum++;
-        }
-        }
-    }
-    }
-    if(!isPc && appPermission){
-    if (!userProvider.get().getIsAdministrator()){
-        Object recycleCleanOrderObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleCleanOrderQueryWrapper,RecycleCleanOrderEntity.class,recycleCleanOrderPagination.getMenuId(),"0"));
-        if (ObjectUtil.isEmpty(recycleCleanOrderObj)){
-        return new ArrayList<>();
-        } else {
-        recycleCleanOrderQueryWrapper = (QueryWrapper<RecycleCleanOrderEntity>)recycleCleanOrderObj;
-        if( recycleCleanOrderQueryWrapper.getExpression().getNormal().size()>0){
-        recycleCleanOrderNum++;
-        }
+        boolean pcPermission = true;
+        boolean appPermission = false;
+        if (isPc && pcPermission) {
+            if (!userProvider.get().getIsAdministrator()) {
+                Object recycleCleanOrderObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleCleanOrderQueryWrapper, RecycleCleanOrderEntity.class, recycleCleanOrderPagination.getMenuId(), "0"));
+                if (ObjectUtil.isEmpty(recycleCleanOrderObj)) {
+                    return new ArrayList<>();
+                } else {
+                    recycleCleanOrderQueryWrapper = (QueryWrapper<RecycleCleanOrderEntity>) recycleCleanOrderObj;
+                    if (recycleCleanOrderQueryWrapper.getExpression().getNormal().size() > 0) {
+                        recycleCleanOrderNum++;
+                    }
+                }
+            }
         }
+        if (!isPc && appPermission) {
+            if (!userProvider.get().getIsAdministrator()) {
+                Object recycleCleanOrderObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleCleanOrderQueryWrapper, RecycleCleanOrderEntity.class, recycleCleanOrderPagination.getMenuId(), "0"));
+                if (ObjectUtil.isEmpty(recycleCleanOrderObj)) {
+                    return new ArrayList<>();
+                } else {
+                    recycleCleanOrderQueryWrapper = (QueryWrapper<RecycleCleanOrderEntity>) recycleCleanOrderObj;
+                    if (recycleCleanOrderQueryWrapper.getExpression().getNormal().size() > 0) {
+                        recycleCleanOrderNum++;
+                    }
+                }
 
 
-    }
-    }
-        if(isPc){
-            if(ObjectUtil.isNotEmpty(recycleCleanOrderPagination.getOrderNo())){
-            recycleCleanOrderNum++;
+            }
+        }
+        if (isPc) {
+            if (ObjectUtil.isNotEmpty(recycleCleanOrderPagination.getOrderNo())) {
+                recycleCleanOrderNum++;
 
                 String value = recycleCleanOrderPagination.getOrderNo() instanceof List ?
-                    JsonUtil.getObjectToString(recycleCleanOrderPagination.getOrderNo()) :
-                    String.valueOf(recycleCleanOrderPagination.getOrderNo());
-                recycleCleanOrderQueryWrapper.lambda().like(RecycleCleanOrderEntity::getOrderNo,value);
+                        JsonUtil.getObjectToString(recycleCleanOrderPagination.getOrderNo()) :
+                        String.valueOf(recycleCleanOrderPagination.getOrderNo());
+                recycleCleanOrderQueryWrapper.lambda().like(RecycleCleanOrderEntity::getOrderNo, value);
 
             }
 
-            if(ObjectUtil.isNotEmpty(recycleCleanOrderPagination.getBucketCode())){
-            recycleCleanOrderNum++;
+            if (ObjectUtil.isNotEmpty(recycleCleanOrderPagination.getBucketCode())) {
+                recycleCleanOrderNum++;
 
                 String value = recycleCleanOrderPagination.getBucketCode() instanceof List ?
-                    JsonUtil.getObjectToString(recycleCleanOrderPagination.getBucketCode()) :
-                    String.valueOf(recycleCleanOrderPagination.getBucketCode());
-                recycleCleanOrderQueryWrapper.lambda().like(RecycleCleanOrderEntity::getBucketCode,value);
+                        JsonUtil.getObjectToString(recycleCleanOrderPagination.getBucketCode()) :
+                        String.valueOf(recycleCleanOrderPagination.getBucketCode());
+                recycleCleanOrderQueryWrapper.lambda().like(RecycleCleanOrderEntity::getBucketCode, value);
 
             }
 
         }
         List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
-        if (total>0){
-            if (intersection.size()==0){
+        if (total > 0) {
+            if (intersection.size() == 0) {
                 intersection.add("jnpfNullList");
             }
             recycleCleanOrderQueryWrapper.lambda().in(RecycleCleanOrderEntity::getId, intersection);
         }
-    //是否有高级查询
-        if (StringUtil.isNotEmpty(superOp)){
-            if (allSuperIDlist.size()==0){
+        //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)) {
+            if (allSuperIDlist.size() == 0) {
                 allSuperIDlist.add("jnpfNullList");
             }
             List<String> finalAllSuperIDlist = allSuperIDlist;
-            recycleCleanOrderQueryWrapper.lambda().and(t->t.in(RecycleCleanOrderEntity::getId, finalAllSuperIDlist));
+            recycleCleanOrderQueryWrapper.lambda().and(t -> t.in(RecycleCleanOrderEntity::getId, finalAllSuperIDlist));
         }
-    //是否有数据过滤查询
-        if (StringUtil.isNotEmpty(ruleOp)){
-            if (allRuleIDlist.size()==0){
+        //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)) {
+            if (allRuleIDlist.size() == 0) {
                 allRuleIDlist.add("jnpfNullList");
             }
             List<String> finalAllRuleIDlist = allRuleIDlist;
-            recycleCleanOrderQueryWrapper.lambda().and(t->t.in(RecycleCleanOrderEntity::getId, finalAllRuleIDlist));
+            recycleCleanOrderQueryWrapper.lambda().and(t -> t.in(RecycleCleanOrderEntity::getId, finalAllRuleIDlist));
         }
 
         //排序
-        if(StringUtil.isEmpty(recycleCleanOrderPagination.getSidx())){
+        if (StringUtil.isEmpty(recycleCleanOrderPagination.getSidx())) {
             recycleCleanOrderQueryWrapper.lambda().orderByDesc(RecycleCleanOrderEntity::getId);
-        }else{
+        } else {
             try {
                 String sidx = recycleCleanOrderPagination.getSidx();
-                String[] strs= sidx.split("_name");
+                String[] strs = sidx.split("_name");
                 RecycleCleanOrderEntity recycleCleanOrderEntity = new RecycleCleanOrderEntity();
                 Field declaredField = recycleCleanOrderEntity.getClass().getDeclaredField(strs[0]);
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
-                recycleCleanOrderQueryWrapper="asc".equals(recycleCleanOrderPagination.getSort().toLowerCase())?recycleCleanOrderQueryWrapper.orderByAsc(value):recycleCleanOrderQueryWrapper.orderByDesc(value);
+                recycleCleanOrderQueryWrapper = "asc".equals(recycleCleanOrderPagination.getSort().toLowerCase()) ? recycleCleanOrderQueryWrapper.orderByAsc(value) : recycleCleanOrderQueryWrapper.orderByDesc(value);
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }
         }
 
-        if("0".equals(dataType)){
-            if((total>0 && AllIdList.size()>0) || total==0){
-                Page<RecycleCleanOrderEntity> page=new Page<>(recycleCleanOrderPagination.getCurrentPage(), recycleCleanOrderPagination.getPageSize());
-                IPage<RecycleCleanOrderEntity> userIPage=this.page(page, recycleCleanOrderQueryWrapper);
-                return recycleCleanOrderPagination.setData(userIPage.getRecords(),userIPage.getTotal());
-            }else{
+        if ("0".equals(dataType)) {
+            if ((total > 0 && AllIdList.size() > 0) || total == 0) {
+                Page<RecycleCleanOrderEntity> page = new Page<>(recycleCleanOrderPagination.getCurrentPage(), recycleCleanOrderPagination.getPageSize());
+                IPage<RecycleCleanOrderEntity> userIPage = this.page(page, recycleCleanOrderQueryWrapper);
+                return recycleCleanOrderPagination.setData(userIPage.getRecords(), userIPage.getTotal());
+            } else {
                 List<RecycleCleanOrderEntity> list = new ArrayList();
                 return recycleCleanOrderPagination.setData(list, list.size());
             }
-        }else{
+        } else {
             return this.list(recycleCleanOrderQueryWrapper);
         }
     }
+
     @Override
-    public RecycleCleanOrderEntity getInfo(String id){
-        QueryWrapper<RecycleCleanOrderEntity> queryWrapper=new QueryWrapper<>();
-        queryWrapper.lambda().eq(RecycleCleanOrderEntity::getId,id);
+    public RecycleCleanOrderEntity getInfo(String id) {
+        QueryWrapper<RecycleCleanOrderEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(RecycleCleanOrderEntity::getId, id);
         return this.getOne(queryWrapper);
     }
+
     @Override
-    public void create(RecycleCleanOrderEntity entity){
+    public void create(RecycleCleanOrderEntity entity) {
         this.save(entity);
     }
+
     @Override
-    public boolean update(String id, RecycleCleanOrderEntity entity){
+    public boolean update(String id, RecycleCleanOrderEntity entity) {
         return this.updateById(entity);
     }
+
     @Override
-    public void delete(RecycleCleanOrderEntity entity){
-        if(entity!=null){
+    public void delete(RecycleCleanOrderEntity entity) {
+        if (entity != null) {
             this.removeById(entity.getId());
         }
     }
-    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+
+    /**
+     * 验证表单唯一字段，正则，非空 i-0新增-1修改
+     */
     @Override
-    public String checkForm(RecycleCleanOrderForm form,int i) {
-        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
-        String id="";
+    public String checkForm(RecycleCleanOrderForm form, int i) {
+        boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id = "";
         String countRecover = "";
-        if (isUp){
+        if (isUp) {
             id = form.getId();
         }
         //主表字段验证
         return countRecover;
     }
+
+    //审核
+    @Override
+    @Transactional
+    public boolean audit(CleanAuditForm form) {
+        String id = form.getId();
+        UserInfo userInfo = userProvider.get();
+        form.setLastModifyUserId(userInfo.getUserId());
+        form.setLastModifyTime(LocalDateTime.now());
+        UpdateWrapper<RecycleCleanOrderEntity> wrapper = new UpdateWrapper<>();
+        wrapper.lambda()
+                .set(RecycleCleanOrderEntity::getAdjustStatus, form.getAdjustStatus())
+                .set(RecycleCleanOrderEntity::getAdjustWeight, form.getAdjustWeight())
+                .set(RecycleCleanOrderEntity::getAdjustPrice, form.getAdjustPrice())
+                .set(RecycleCleanOrderEntity::getAdjustComm, form.getAdjustComm())
+                .set(RecycleCleanOrderEntity::getEntryStatus, form.getEntryStatus())
+                .set(RecycleCleanOrderEntity::getLastModifyUserId, form.getLastModifyUserId())
+                .set(RecycleCleanOrderEntity::getLastModifyTime, form.getLastModifyTime())
+                .eq(RecycleCleanOrderEntity::getId, id);
+        return this.update(wrapper);
+    }
+
+    //批量审核
+    @Override
+    @Transactional
+    public Integer auditBatch(CleanAuditBatch batch) {
+        UserInfo userInfo = userProvider.get();
+        batch.setLastModifyUserId(userInfo.getUserId());
+        batch.setLastModifyTime(LocalDateTime.now());
+        int update = cleanOrderMapper.auditBatch(batch);
+        //todo 审核拒绝 结算总价调整为0
+
+        return update;
+    }
+
     /**
-    * 新增修改数据(事务回滚)
-    * @param id
-    * @param recycleCleanOrderForm
-    * @return
-    */
+     * 新增修改数据(事务回滚)
+     *
+     * @param id
+     * @param recycleCleanOrderForm
+     * @return
+     */
     @Override
     @Transactional
-    public void saveOrUpdate(RecycleCleanOrderForm recycleCleanOrderForm,String id, boolean isSave) throws Exception{
-        UserInfo userInfo=userProvider.get();
+    public void saveOrUpdate(RecycleCleanOrderForm recycleCleanOrderForm, String id, boolean isSave) throws Exception {
+        UserInfo userInfo = userProvider.get();
         UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
         recycleCleanOrderForm = JsonUtil.getJsonToBean(
-        generaterSwapUtil.swapDatetime(RecycleCleanOrderConstant.getFormData(),recycleCleanOrderForm),RecycleCleanOrderForm.class);
+                generaterSwapUtil.swapDatetime(RecycleCleanOrderConstant.getFormData(), recycleCleanOrderForm), RecycleCleanOrderForm.class);
         RecycleCleanOrderEntity entity = JsonUtil.getJsonToBean(recycleCleanOrderForm, RecycleCleanOrderEntity.class);
 
-        if(isSave){
-            String mainId =  RandomUtil.uuId() ;
-        entity.setOrderNo(generaterSwapUtil.getBillNumber("cleanOrderNo", false));
+        if (isSave) {
+            String mainId = RandomUtil.uuId();
+            entity.setOrderNo(generaterSwapUtil.getBillNumber("cleanOrderNo", false));
             entity.setId(mainId);
-        }else{
-        entity.setOrderNo(generaterSwapUtil.getBillNumber("cleanOrderNo", false));
+        } else {
+            entity.setOrderNo(generaterSwapUtil.getBillNumber("cleanOrderNo", false));
         }
         this.saveOrUpdate(entity);
 

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleCleanOrderController.java

@@ -15,22 +15,27 @@ import jnpf.model.recyclecleanorder.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
 import java.util.*;
+
 import jnpf.annotation.JnpfField;
 import jnpf.base.vo.PageListVO;
 import jnpf.base.vo.PaginationVO;
 import jnpf.base.vo.DownloadVO;
 import jnpf.config.ConfigValueUtil;
 import jnpf.base.entity.ProvinceEntity;
+
 import java.io.IOException;
 import java.util.stream.Collectors;
+
 import jnpf.engine.entity.FlowTaskEntity;
 import jnpf.exception.WorkFlowException;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 清运清单
+ *
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
@@ -38,7 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Slf4j
 @RestController
-@Tag(name = "清运清单" , description = "scm")
+@Tag(name = "清运清单", description = "scm")
 @RequestMapping("/api/scm/RecycleCleanOrder")
 public class RecycleCleanOrderController {
 
@@ -52,27 +57,26 @@ public class RecycleCleanOrderController {
     private RecycleCleanOrderService recycleCleanOrderService;
 
 
-
     /**
-    * 列表
-    *
-    * @param recycleCleanOrderPagination
-    * @return
-    */
+     * 列表
+     *
+     * @param recycleCleanOrderPagination
+     * @return
+     */
     @Operation(summary = "获取列表")
     @PostMapping("/getList")
-    public ActionResult list(@RequestBody RecycleCleanOrderPagination recycleCleanOrderPagination)throws IOException{
-        List<RecycleCleanOrderEntity> list= recycleCleanOrderService.getList(recycleCleanOrderPagination);
-        List<Map<String, Object>> realList=new ArrayList<>();
+    public ActionResult list(@RequestBody RecycleCleanOrderPagination recycleCleanOrderPagination) throws IOException {
+        List<RecycleCleanOrderEntity> list = recycleCleanOrderService.getList(recycleCleanOrderPagination);
+        List<Map<String, Object>> realList = new ArrayList<>();
         for (RecycleCleanOrderEntity entity : list) {
-        Map<String, Object> recycleCleanOrderMap=JsonUtil.entityToMap(entity);
-        recycleCleanOrderMap.put("id", recycleCleanOrderMap.get("id"));
-        //副表数据
-        //子表数据
+            Map<String, Object> recycleCleanOrderMap = JsonUtil.entityToMap(entity);
+            recycleCleanOrderMap.put("id", recycleCleanOrderMap.get("id"));
+            //副表数据
+            //子表数据
             realList.add(recycleCleanOrderMap);
         }
         //数据转换
-        realList = generaterSwapUtil.swapDataList(realList, RecycleCleanOrderConstant.getFormData(), RecycleCleanOrderConstant.getColumnData(), recycleCleanOrderPagination.getModuleId(),false);
+        realList = generaterSwapUtil.swapDataList(realList, RecycleCleanOrderConstant.getFormData(), RecycleCleanOrderConstant.getColumnData(), recycleCleanOrderPagination.getModuleId(), false);
 
         //返回对象
         PageListVO vo = new PageListVO();
@@ -81,110 +85,148 @@ public class RecycleCleanOrderController {
         vo.setPagination(page);
         return ActionResult.success(vo);
     }
+
     /**
-    * 创建
-    *
-    * @param recycleCleanOrderForm
-    * @return
-    */
+     * 创建
+     *
+     * @param recycleCleanOrderForm
+     * @return
+     */
     @PostMapping()
     @Operation(summary = "创建")
     public ActionResult create(@RequestBody @Valid RecycleCleanOrderForm recycleCleanOrderForm) {
-        String b = recycleCleanOrderService.checkForm(recycleCleanOrderForm,0);
-        if (StringUtil.isNotEmpty(b)){
-            return ActionResult.fail(b );
+        String b = recycleCleanOrderService.checkForm(recycleCleanOrderForm, 0);
+        if (StringUtil.isNotEmpty(b)) {
+            return ActionResult.fail(b);
         }
-        try{
-            recycleCleanOrderService.saveOrUpdate(recycleCleanOrderForm, null ,true);
-        }catch(Exception e){
+        try {
+            recycleCleanOrderService.saveOrUpdate(recycleCleanOrderForm, null, true);
+        } catch (Exception e) {
             return ActionResult.fail("新增数据失败");
         }
         return ActionResult.success("创建成功");
     }
+
     /**
-    * 编辑
-    * @param id
-    * @param recycleCleanOrderForm
-    * @return
-    */
+     * 编辑
+     *
+     * @param id
+     * @param recycleCleanOrderForm
+     * @return
+     */
     @PutMapping("/{id}")
     @Operation(summary = "更新")
-    public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid RecycleCleanOrderForm recycleCleanOrderForm,
-                                @RequestParam(value = "isImport", required = false) boolean isImport){
+    public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid RecycleCleanOrderForm recycleCleanOrderForm,
+                               @RequestParam(value = "isImport", required = false) boolean isImport) {
         recycleCleanOrderForm.setId(id);
         if (!isImport) {
-            String b =  recycleCleanOrderService.checkForm(recycleCleanOrderForm,1);
-            if (StringUtil.isNotEmpty(b)){
-                return ActionResult.fail(b );
+            String b = recycleCleanOrderService.checkForm(recycleCleanOrderForm, 1);
+            if (StringUtil.isNotEmpty(b)) {
+                return ActionResult.fail(b);
             }
         }
-        RecycleCleanOrderEntity entity= recycleCleanOrderService.getInfo(id);
-        if(entity!=null){
-            try{
-                recycleCleanOrderService.saveOrUpdate(recycleCleanOrderForm,id,false);
-            }catch(Exception e){
+        RecycleCleanOrderEntity entity = recycleCleanOrderService.getInfo(id);
+        if (entity != null) {
+            try {
+                recycleCleanOrderService.saveOrUpdate(recycleCleanOrderForm, id, false);
+            } catch (Exception e) {
                 return ActionResult.fail("修改数据失败");
             }
             return ActionResult.success("更新成功");
-        }else{
+        } else {
             return ActionResult.fail("更新失败，数据不存在");
         }
     }
+
     /**
-    * 删除
-    * @param id
-    * @return
-    */
+     * 删除
+     *
+     * @param id
+     * @return
+     */
     @Operation(summary = "删除")
     @DeleteMapping("/{id}")
     @Transactional
-    public ActionResult delete(@PathVariable("id") String id){
-        RecycleCleanOrderEntity entity= recycleCleanOrderService.getInfo(id);
-        if(entity!=null){
+    public ActionResult delete(@PathVariable("id") String id) {
+        RecycleCleanOrderEntity entity = recycleCleanOrderService.getInfo(id);
+        if (entity != null) {
             //主表数据删除
             recycleCleanOrderService.delete(entity);
         }
         return ActionResult.success("删除成功");
     }
+
     /**
-    * 表单信息(详情页)
-    * 详情页面使用-转换数据
-    * @param id
-    * @return
-    */
+     * 表单信息(详情页)
+     * 详情页面使用-转换数据
+     *
+     * @param id
+     * @return
+     */
     @Operation(summary = "表单信息(详情页)")
     @GetMapping("/detail/{id}")
-    public ActionResult detailInfo(@PathVariable("id") String id){
-        RecycleCleanOrderEntity entity= recycleCleanOrderService.getInfo(id);
-        if(entity==null){
+    public ActionResult detailInfo(@PathVariable("id") String id) {
+        RecycleCleanOrderEntity entity = recycleCleanOrderService.getInfo(id);
+        if (entity == null) {
             return ActionResult.fail("表单数据不存在！");
         }
-        Map<String, Object> recycleCleanOrderMap=JsonUtil.entityToMap(entity);
+        Map<String, Object> recycleCleanOrderMap = JsonUtil.entityToMap(entity);
         recycleCleanOrderMap.put("id", recycleCleanOrderMap.get("id"));
         //副表数据
         //子表数据
-        recycleCleanOrderMap = generaterSwapUtil.swapDataDetail(recycleCleanOrderMap,RecycleCleanOrderConstant.getFormData(),"564710229816651141",false);
+        recycleCleanOrderMap = generaterSwapUtil.swapDataDetail(recycleCleanOrderMap, RecycleCleanOrderConstant.getFormData(), "564710229816651141", false);
         return ActionResult.success(recycleCleanOrderMap);
     }
+
     /**
-    * 获取详情(编辑页)
-    * 编辑页面使用-不转换数据
-    * @param id
-    * @return
-    */
+     * 获取详情(编辑页)
+     * 编辑页面使用-不转换数据
+     *
+     * @param id
+     * @return
+     */
     @Operation(summary = "信息")
     @GetMapping("/{id}")
-    public ActionResult info(@PathVariable("id") String id){
-        RecycleCleanOrderEntity entity= recycleCleanOrderService.getInfo(id);
-        if(entity==null){
+    public ActionResult info(@PathVariable("id") String id) {
+        RecycleCleanOrderEntity entity = recycleCleanOrderService.getInfo(id);
+        if (entity == null) {
             return ActionResult.fail("表单数据不存在！");
         }
-        Map<String, Object> recycleCleanOrderMap=JsonUtil.entityToMap(entity);
+        Map<String, Object> recycleCleanOrderMap = JsonUtil.entityToMap(entity);
         recycleCleanOrderMap.put("id", recycleCleanOrderMap.get("id"));
         //副表数据
         //子表数据
-        recycleCleanOrderMap = generaterSwapUtil.swapDataForm(recycleCleanOrderMap,RecycleCleanOrderConstant.getFormData(),RecycleCleanOrderConstant.TABLEFIELDKEY,RecycleCleanOrderConstant.TABLERENAMES);
+        recycleCleanOrderMap = generaterSwapUtil.swapDataForm(recycleCleanOrderMap, RecycleCleanOrderConstant.getFormData(), RecycleCleanOrderConstant.TABLEFIELDKEY, RecycleCleanOrderConstant.TABLERENAMES);
         return ActionResult.success(recycleCleanOrderMap);
     }
 
+
+    /**
+     * @param auditForm
+     * @return
+     */
+    @Operation(summary = "审核")
+    @PostMapping("/audit")
+    public ActionResult Audit(CleanAuditForm auditForm) {
+        RecycleCleanOrderEntity order = recycleCleanOrderService.getInfo(auditForm.getId());
+        if (order == null) {
+            return ActionResult.fail("审核操作失败：订单已不存在！");
+        }
+        boolean audit = recycleCleanOrderService.audit(auditForm);
+        if (audit) return ActionResult.success("审核操作成功");
+        else return ActionResult.fail("审核操作失败");
+    }
+
+    /**
+     * @param batch
+     * @return
+     */
+    @Operation(summary = "批量审核")
+    @PostMapping("/audit")
+    public ActionResult AuditBatch(CleanAuditBatch batch) {
+        int up = recycleCleanOrderService.auditBatch(batch);
+        if (up > 0) return ActionResult.success("审核操作成功");
+        else return ActionResult.fail("审核操作失败");
+    }
+
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/CompanyEntity.java

@@ -0,0 +1,35 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+@TableName("base_organize")
+public class CompanyEntity {
+    @TableId(value = "F_ID")
+    private String id;
+    @TableField(value = "F_PARENT_ID")
+    private String pid;
+    @TableField("F_EN_CODE")
+    private String enterpriseCode;
+    @TableField("F_FULL_NAME")
+    private String enterpriseName;
+    @TableField("F_DESCRIPTION")
+    private String description;
+    @TableField("F_ENABLED_MARK")
+    private Integer status;
+    @TableField("FUND")
+    private BigDecimal fund;
+    @TableField("PICTURES")
+    private String enterpriseLogo;
+    @TableField("F_CREATOR_TIME")
+    private LocalDateTime creatorTime;
+    @TableField("F_LAST_MODIFY_TIME")
+    private Date fLastModifyTime;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleDeviceConfigEntity.java

@@ -1,29 +1,20 @@
 package jnpf.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import java.util.Date;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
+
 import java.math.BigDecimal;
+import java.util.Date;
 /**
  * 商户(配置)
  *
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
- * @日期： 2024-06-20
+ * @日期： 2024-06-24
  */
 @Data
 @TableName("nx_recycle_device_config")

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recyclecleanorder/CleanAuditBatch.java

@@ -0,0 +1,38 @@
+package jnpf.model.recyclecleanorder;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+//审核表单
+@Data
+public class CleanAuditBatch {
+
+    /**
+     * 主键
+     */
+    private List<String> ids;
+
+    /**
+     * 审核状态
+     **/
+    @JsonProperty("adjustStatus")
+    private Integer adjustStatus;
+    /**
+     * 审核说明
+     **/
+    @JsonProperty("adjustComm")
+    private String adjustComm;
+    /**
+     * 入库状态
+     **/
+    @JsonProperty("entryStatus")
+    private Integer entryStatus;
+    @JsonProperty("lastModifyUserId")
+    private String lastModifyUserId;
+    @JsonProperty("lastModifyTime")
+    private LocalDateTime lastModifyTime;
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recyclecleanorder/CleanAuditForm.java

@@ -0,0 +1,48 @@
+package jnpf.model.recyclecleanorder;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+//审核表单
+@Data
+public class CleanAuditForm {
+
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 审核后重量
+     **/
+    @JsonProperty("adjustWeight")
+    private BigDecimal adjustWeight;
+    /**
+     * 审核后总价
+     **/
+    @JsonProperty("adjustPrice")
+    private BigDecimal adjustPrice;
+
+    /**
+     * 审核状态
+     **/
+    @JsonProperty("adjustStatus")
+    private Integer adjustStatus;
+    /**
+     * 审核说明
+     **/
+    @JsonProperty("adjustComm")
+    private String adjustComm;
+    /**
+     * 入库状态
+     **/
+    @JsonProperty("entryStatus")
+    private Integer entryStatus;
+    @JsonProperty("lastModifyUserId")
+    private String lastModifyUserId;
+    @JsonProperty("lastModifyTime")
+    private LocalDateTime lastModifyTime;
+
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeliveryorder/DeliveryAuditBatch.java

@@ -0,0 +1,41 @@
+package jnpf.model.recycledeliveryorder;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+//审核表单
+@Data
+public class DeliveryAuditBatch {
+
+    /** 主键 */
+    private String id;
+    /** 清运单号 **/
+    @JsonProperty("orderNo")
+    private String orderNo;
+    @JsonProperty("deviceOrderNo")
+    private String deviceOrderNo;
+    /** 单价 **/
+    @JsonProperty("price")
+    private BigDecimal price;
+    /** 清运重量 **/
+    @JsonProperty("weight")
+    private BigDecimal weight;
+    /** 总价 **/
+    @JsonProperty("totalPrice")
+    private BigDecimal totalPrice;
+    /** 审核后重量 **/
+    @JsonProperty("adjustWeight")
+    private BigDecimal adjustWeight;
+    /** 审核后总价 **/
+    @JsonProperty("reportTime")
+    private String reportTime;
+    /** 审核状态 **/
+    @JsonProperty("adjustStatus")
+    private String adjustStatus;
+    /** 入库状态 **/
+    @JsonProperty("entryStatus")
+    private String entryStatus;
+    /** 审核说明 **/
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeliveryorder/DeliveryAuditForm.java

@@ -0,0 +1,41 @@
+package jnpf.model.recycledeliveryorder;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+//审核表单
+@Data
+public class DeliveryAuditForm {
+
+    /** 主键 */
+    private String id;
+    /** 清运单号 **/
+    @JsonProperty("orderNo")
+    private String orderNo;
+    @JsonProperty("deviceOrderNo")
+    private String deviceOrderNo;
+    /** 单价 **/
+    @JsonProperty("price")
+    private BigDecimal price;
+    /** 清运重量 **/
+    @JsonProperty("weight")
+    private BigDecimal weight;
+    /** 总价 **/
+    @JsonProperty("totalPrice")
+    private BigDecimal totalPrice;
+    /** 审核后重量 **/
+    @JsonProperty("adjustWeight")
+    private BigDecimal adjustWeight;
+    /** 审核后总价 **/
+    @JsonProperty("reportTime")
+    private String reportTime;
+    /** 审核状态 **/
+    @JsonProperty("adjustStatus")
+    private String adjustStatus;
+    /** 入库状态 **/
+    @JsonProperty("entryStatus")
+    private String entryStatus;
+    /** 审核说明 **/
+}

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeviceconfig/RecycleDeviceConfigForm.java

@@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
- * @日期： 2024-06-20
+ * @日期： 2024-06-24
  */
 @Data
 public class RecycleDeviceConfigForm  {
@@ -98,10 +98,4 @@ public class RecycleDeviceConfigForm  {
     /** 组织架构 **/
     @JsonProperty("organizeJsonId")
     private Object organizeJsonId;
-    /** 公司id **/
-    @JsonProperty("companyId")
-    private Object companyId;
-    /** 部门id **/
-    @JsonProperty("departmentId")
-    private String departmentId;
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recycledeviceconfig/RecycleDeviceConfigPagination.java

@@ -11,7 +11,7 @@ import java.util.List;
  * @版本： V3.5
  * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
  * @作者： JNPF开发平台组
- * @日期： 2024-06-20
+ * @日期： 2024-06-24
  */
 @Data
 public class RecycleDeviceConfigPagination extends Pagination {