geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
shunyi.kuang
2026-01-27 17:31:58 +08:00
parent 62e9134209 317b0020e3
commit b410ac7830
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -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," + @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," + " 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," + " 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" + " FROM lng_contract k" +
" JOIN lng_contract_sales_png_point kppp ON kppp.k_id=k.id" + " 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" + " LEFT JOIN lng_customer cu on cu.cu_code=k.cp_code" +

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

@ -17,7 +17,6 @@ import com.xjrsoft.common.exception.BusinessException;
import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.model.result.R;
import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.ConventPage;
import com.xjrsoft.common.page.PageOutput; import com.xjrsoft.common.page.PageOutput;
import com.xjrsoft.common.utils.VoToColumnUtil;
import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.datalog.service.DatalogService;
import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
import com.xjrsoft.module.sales.dto.LngApproPageDto; 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.getTypeCode()),LngAppro::getTypeCode,dto.getTypeCode())
.eq(StrUtil.isNotBlank(dto.getApproCode()),LngAppro::getApproCode,dto.getApproCode()) .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); IPage<LngAppro> page = approService.page(ConventPage.getPage(dto), queryWrapper);
PageOutput<LngApproPageVo> pageOutput = ConventPage.getPageOutput(page, LngApproPageVo.class); PageOutput<LngApproPageVo> pageOutput = ConventPage.getPageOutput(page, LngApproPageVo.class);
List<LngApproPageVo> list = pageOutput.list; List<LngApproPageVo> list = pageOutput.list;