修改

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPageVo.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.contract.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xjrsoft.common.model.base.BaseModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,7 +14,7 @@ import java.time.LocalDateTime;
 * @Version 1.0
 */
 @Data
-public class LngContractPageVo {
+public class LngContractPageVo extends BaseModel {
 
     /**
     * 主键
@@ -82,11 +83,11 @@ public class LngContractPageVo {
     */
     @ApiModelProperty("备注")
     private String note;
-    /**
+//    /**
-     * 数据权限id
+//     * 数据权限id
-     */
+//     */
-    @ApiModelProperty("数据权限id")
+//    @ApiModelProperty("数据权限id")
-    private Long ruleUserId;
+//    private Long ruleUserId;
     /**
      * 交割点名称
      */

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/controller/ContractFactController.java

@@ -16,7 +16,6 @@ import com.xjrsoft.common.exception.BusinessException;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.contract.dto.LngContractFactPageDto;
 import com.xjrsoft.module.contract.dto.UpdateLngContractFactDto;
 import com.xjrsoft.module.contract.entity.LngContractFact;
@@ -65,8 +64,7 @@ public class ContractFactController {
                                 .like(LngContractFact::getKName, dto.getKName())
                 )
                 .eq(StrUtil.isNotBlank(dto.getRelTypeCode()), LngContractFact::getRelTypeCode,dto.getRelTypeCode())
-                    .orderByDesc(LngContractFact::getDateDraft, LngContractFact::getKNo)
+                    .orderByDesc(LngContractFact::getDateDraft, LngContractFact::getKNo);
-                .select(LngContractFact.class,x -> VoToColumnUtil.fieldsToColumns(LngContractFactPageVo.class).contains(x.getProperty()));
         IPage<LngContractFact> page = contractFactService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<LngContractFactPageVo> pageOutput = ConventPage.getPageOutput(page, LngContractFactPageVo.class);
         List<LngContractFactPageVo> list = pageOutput.list;

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractMapper.java

@@ -27,7 +27,7 @@ public interface LngContractMapper extends MPJBaseMapper<LngContract>, BaseMappe
     @Select("SELECT k.id, k.rule_user_id, k.k_no, k.k_name, cu.cu_sname AS cp_name, k.date_from," +
             "       k.date_to, GROUP_CONCAT(DISTINCT p.full_name) AS point_up_name," +
             "       GROUP_CONCAT(DISTINCT di_trans.name) AS trans_name, com.name as com_name," +
-            "       k.appro_code, dd_a.name as appro_name, k.note" +
+            "       k.appro_code, dd_a.name as appro_name, k.note, k.create_user_id" +
             "  FROM lng_contract k" +
             "  JOIN lng_contract_sales_png_point kppp ON kppp.k_id=k.id" +
             "  LEFT JOIN lng_customer cu on cu.cu_code=k.cp_code" +

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/ApproController.java

@@ -17,7 +17,6 @@ import com.xjrsoft.common.exception.BusinessException;
 import com.xjrsoft.common.model.result.R;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
-import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.datalog.service.DatalogService;
 import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
 import com.xjrsoft.module.sales.dto.LngApproPageDto;
@@ -69,8 +68,7 @@ public class ApproController {
                 )
                 .eq(StrUtil.isNotBlank(dto.getTypeCode()),LngAppro::getTypeCode,dto.getTypeCode())
                 .eq(StrUtil.isNotBlank(dto.getApproCode()),LngAppro::getApproCode,dto.getApproCode())
-                    .orderByDesc(LngAppro::getId)
+                    .orderByDesc(LngAppro::getId);
-                .select(LngAppro.class,x -> VoToColumnUtil.fieldsToColumns(LngApproPageVo.class).contains(x.getProperty()));
         IPage<LngAppro> page = approService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<LngApproPageVo> pageOutput = ConventPage.getPageOutput(page, LngApproPageVo.class);
         List<LngApproPageVo> list = pageOutput.list;