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:
t-shunyi.kuang
2025-12-02 15:41:02 +08:00
parent 27ff645a3b c066c601ee
commit c3fcb176e1
56 changed files with 2626 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddTestflow001Dto.java Normal file
View File

@ -0,0 +1,62 @@
package com.xjrsoft.module.mdm.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogTable;
/**
* @title: 测试流程1
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
@LogTable(source="testflow_001",name="测试流程1")
public class AddTestflow001Dto implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户
*/
@ApiModelProperty("客户")
@LogField(name="客户",index=0)
private String customer;
/**
* 客户编码
*/
@ApiModelProperty("客户编码")
@LogField(name="客户编码",index=0)
private String customerCode;
/**
* 名称
*/
@ApiModelProperty("名称")
@LogField(name="名称",index=0)
private String name;
/**
* 备注
*/
@ApiModelProperty("备注")
@LogField(name="备注",index=0)
private String note;
/**
*
*/
@ApiModelProperty("")
@LogField(name="",index=0)
private Long tenantId;
}

56
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddTestflow003Dto.java Normal file
View File

@ -0,0 +1,56 @@
package com.xjrsoft.module.mdm.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogTable;
/**
* @title: 测试流程3
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
@LogTable(source="testflow_003",name="测试流程3")
public class AddTestflow003Dto implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 名称
*/
@ApiModelProperty("名称")
@LogField(name="名称",index=0)
private String name;
/**
* 编码
*/
@ApiModelProperty("编码")
@LogField(name="编码",index=0)
private String code;
/**
* 备注
*/
@ApiModelProperty("备注")
@LogField(name="备注",index=0)
private String note;
/**
*
*/
@ApiModelProperty("")
@LogField(name="",index=0)
private Long tenantId;
}

45
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/Testflow001PageDto.java Normal file
View File

@ -0,0 +1,45 @@
package com.xjrsoft.module.mdm.dto;
import com.xjrsoft.common.page.PageInput;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* @title: 分页查询入参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class Testflow001PageDto extends PageInput {
/**
* 客户
*/
@ApiModelProperty("客户")
private String customer;
/**
* 客户编码
*/
@ApiModelProperty("客户编码")
private String customerCode;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
}

40
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/Testflow003PageDto.java Normal file
View File

@ -0,0 +1,40 @@
package com.xjrsoft.module.mdm.dto;
import com.xjrsoft.common.page.PageInput;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* @title: 分页查询入参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class Testflow003PageDto extends PageInput {
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 编码
*/
@ApiModelProperty("编码")
private String code;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
}

10
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBPortDto.java
View File

@ -43,21 +43,21 @@ public class UpdateLngBPortDto implements Serializable {
/**
* 助记码(自动生成，4位，0001……)
*/
@LogField(name="助记码(自动生成，4位，0001……)",index=1)
@LogField(name="助记码",index=1)
@ApiModelProperty("助记码(自动生成，4位，0001……)")
private String code;
/**
* 名称(名称和简称都不能重复)
*/
@LogField(name="名称(名称和简称都不能重复)",index=2)
@LogField(name="名称",index=2)
@ApiModelProperty("名称(名称和简称都不能重复)")
private String fullName;
/**
* 简称(名称和简称都不能重复)
*/
@LogField(name="简称(名称和简称都不能重复)",index=3)
@LogField(name="简称",index=3)
@ApiModelProperty("简称(名称和简称都不能重复)")
private String shortName;
@ -127,7 +127,7 @@ public class UpdateLngBPortDto implements Serializable {
/**
* 有效标志(Y-有效，N-无效)
*/
@LogField(name="有效标志(Y-有效，N-无效)",index=13)
@LogField(name="有效标志",index=13)
@ApiModelProperty("有效标志(Y-有效，N-无效)")
private String valid;
@ -141,7 +141,7 @@ public class UpdateLngBPortDto implements Serializable {
/**
* 租户id
*/
@LogField(name="租户id",index=15)
@LogField(name="租户",index=15)
@ApiModelProperty("租户id")
private Long tenantId;

79
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateTestflow001Dto.java Normal file
View File

@ -0,0 +1,79 @@
package com.xjrsoft.module.mdm.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.List;
import com.pictc.annotations.datalog.LogTable;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogJoin;
import com.pictc.annotations.datalog.LogJoinColumn;
import com.pictc.annotations.datalog.JoinCaseType;
import com.pictc.annotations.datalog.JoinType;
import com.pictc.annotations.datalog.ValueDirectionType;
/**
* @title: 测试流程1
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
@LogTable(source="testflow_001",name="测试流程1")
public class UpdateTestflow001Dto implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@LogField(name="",index=0)
@ApiModelProperty("")
private Long id;
/**
* 客户
*/
@LogField(name="客户",index=1)
@ApiModelProperty("客户")
private String customer;
/**
* 客户编码
*/
@LogField(name="客户编码",index=2)
@ApiModelProperty("客户编码")
private String customerCode;
/**
* 名称
*/
@LogField(name="名称",index=3)
@ApiModelProperty("名称")
private String name;
/**
* 备注
*/
@LogField(name="备注",index=4)
@ApiModelProperty("备注")
private String note;
/**
*
*/
@LogField(name="",index=5)
@ApiModelProperty("")
private Long tenantId;
}

72
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateTestflow003Dto.java Normal file
View File

@ -0,0 +1,72 @@
package com.xjrsoft.module.mdm.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.List;
import com.pictc.annotations.datalog.LogTable;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogJoin;
import com.pictc.annotations.datalog.LogJoinColumn;
import com.pictc.annotations.datalog.JoinCaseType;
import com.pictc.annotations.datalog.JoinType;
import com.pictc.annotations.datalog.ValueDirectionType;
/**
* @title: 测试流程3
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
@LogTable(source="testflow_003",name="测试流程3")
public class UpdateTestflow003Dto implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@LogField(name="",index=0)
@ApiModelProperty("")
private Long id;
/**
* 名称
*/
@LogField(name="名称",index=1)
@ApiModelProperty("名称")
private String name;
/**
* 编码
*/
@LogField(name="编码",index=2)
@ApiModelProperty("编码")
private String code;
/**
* 备注
*/
@LogField(name="备注",index=3)
@ApiModelProperty("备注")
private String note;
/**
*
*/
@LogField(name="",index=4)
@ApiModelProperty("")
private Long tenantId;
}

48
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow001PageVo.java Normal file
View File

@ -0,0 +1,48 @@
package com.xjrsoft.module.mdm.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* @title: 分页列表出参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
public class Testflow001PageVo {
/**
*
*/
@ApiModelProperty("")
private String id;
/**
* 客户
*/
@ApiModelProperty("客户")
private String customer;
/**
* 客户编码
*/
@ApiModelProperty("客户编码")
private String customerCode;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
}

100
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow001Vo.java Normal file
View File

@ -0,0 +1,100 @@
package com.xjrsoft.module.mdm.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
/**
* @title: 表单出参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
public class Testflow001Vo {
/**
*
*/
@ApiModelProperty("")
private Long id;
/**
* 客户
*/
@ApiModelProperty("客户")
private String customer;
/**
* 客户编码
*/
@ApiModelProperty("客户编码")
private String customerCode;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
/**
*
*/
@ApiModelProperty("")
private Long createUserId;
/**
*
*/
@ApiModelProperty("")
private LocalDateTime createDate;
/**
*
*/
@ApiModelProperty("")
private Long modifyUserId;
/**
*
*/
@ApiModelProperty("")
private LocalDateTime modifyDate;
/**
*
*/
@ApiModelProperty("")
private Integer enabledMark;
/**
*
*/
@ApiModelProperty("")
private Long tenantId;
}

43
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow003PageVo.java Normal file
View File

@ -0,0 +1,43 @@
package com.xjrsoft.module.mdm.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* @title: 分页列表出参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
public class Testflow003PageVo {
/**
*
*/
@ApiModelProperty("")
private String id;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 编码
*/
@ApiModelProperty("编码")
private String code;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
}

93
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow003Vo.java Normal file
View File

@ -0,0 +1,93 @@
package com.xjrsoft.module.mdm.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
/**
* @title: 表单出参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
public class Testflow003Vo {
/**
*
*/
@ApiModelProperty("")
private Long id;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 编码
*/
@ApiModelProperty("编码")
private String code;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
/**
*
*/
@ApiModelProperty("")
private Long createUserId;
/**
*
*/
@ApiModelProperty("")
private LocalDateTime createDate;
/**
*
*/
@ApiModelProperty("")
private Long modifyUserId;
/**
*
*/
@ApiModelProperty("")
private LocalDateTime modifyDate;
/**
*
*/
@ApiModelProperty("")
private Integer enabledMark;
/**
*
*/
@ApiModelProperty("")
private Long tenantId;
}

2
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerAttrPowerDto.java
View File

@ -28,7 +28,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
* @Version 1.0
*/
@Data
@LogTable(source="lng_customer_attr_power",name="客户")
@LogTable(source="lng_customer_attr_power",name="客户业务信息")
public class UpdateLngCustomerAttrPowerDto implements Serializable {
private static final long serialVersionUID = 1L;

2
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerBankDto.java
View File

@ -28,7 +28,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
* @Version 1.0
*/
@Data
@LogTable(source="lng_customer_bank",name="客户")
@LogTable(source="lng_customer_bank",name="客户银行信息")
public class UpdateLngCustomerBankDto implements Serializable {
private static final long serialVersionUID = 1L;

2
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerContactDto.java
View File

@ -28,7 +28,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
* @Version 1.0
*/
@Data
@LogTable(source="lng_customer_contact",name="客户")
@LogTable(source="lng_customer_contact",name="客户联系人信息")
public class UpdateLngCustomerContactDto implements Serializable {
private static final long serialVersionUID = 1L;

2
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java
View File

@ -28,7 +28,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
* @Version 1.0
*/
@Data
@LogTable(source="lng_customer_doc",name="客户")
@LogTable(source="lng_customer_doc",name="客户证书信息")
public class UpdateLngCustomerDocDto implements Serializable {
private static final long serialVersionUID = 1L;

9
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java
View File

@ -252,7 +252,7 @@ public class UpdateLngCustomerDto implements Serializable {
* lngCustomerAttrPower
*/
@ApiModelProperty("lngCustomerAttrPower子表")
@LogJoin(name = "lngCustomerAttrPower子表",
@LogJoin(name = "客户业务信息",
columns = {
@LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT)
},
@ -262,7 +262,7 @@ public class UpdateLngCustomerDto implements Serializable {
* lngCustomerBank
*/
@ApiModelProperty("lngCustomerBank子表")
@LogJoin(name = "lngCustomerBank子表",
@LogJoin(name = "客户银行信息",
columns = {
@LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT)
},
@ -272,7 +272,7 @@ public class UpdateLngCustomerDto implements Serializable {
* lngCustomerDoc
*/
@ApiModelProperty("lngCustomerDoc子表")
@LogJoin(name = "lngCustomerDoc子表",
@LogJoin(name = "客户证书信息",
columns = {
@LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT)
},
@ -282,8 +282,7 @@ public class UpdateLngCustomerDto implements Serializable {
* lngCustomerContact
*/
@ApiModelProperty("lngCustomerContact子表")
@LogJoin(name = "lngCustomerContact子表",
columns = {
@LogJoin(name = "客户联系人信息",columns = {
@LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT)
},
caseType = JoinCaseType.FULL, target = UpdateLngCustomerContactDto.class, type = JoinType.MANY)

119
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/Testflow001Controller.java Normal file
View File

@ -0,0 +1,119 @@
package com.xjrsoft.module.mdm.controller;
import java.util.List;
import javax.validation.Valid;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.mdm.dto.Testflow001PageDto;
import com.xjrsoft.module.mdm.dto.UpdateTestflow001Dto;
import com.xjrsoft.module.mdm.entity.Testflow001;
import com.xjrsoft.module.mdm.service.ITestflow001Service;
import com.xjrsoft.module.mdm.vo.Testflow001PageVo;
import com.xjrsoft.module.mdm.vo.Testflow001Vo;
import com.xjrsoft.module.system.client.ICodeRuleClient;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
/**
* @title: 测试流程
* @Author 管理员
* @Date: 2025-11-25
* @Version 1.0
*/
@RestController
@RequestMapping("/mdm" + "/testflow001")
@Api(value = "/mdm" + "/testflow001",tags = "测试流程代码")
@AllArgsConstructor
public class Testflow001Controller {
private final ITestflow001Service testflow001Service;
private final ICodeRuleClient codeRuleClient;
private final DatalogService dataService;
@GetMapping(value = "/page")
@ApiOperation(value="Testflow001列表(分页)")
@SaCheckPermission("testflow001:list")
public R page(@Valid Testflow001PageDto dto){
LambdaQueryWrapper<Testflow001> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper
.like(StrUtil.isNotBlank(dto.getCustomer()),Testflow001::getCustomer,dto.getCustomer())
.like(StrUtil.isNotBlank(dto.getCustomerCode()),Testflow001::getCustomerCode,dto.getCustomerCode())
.like(StrUtil.isNotBlank(dto.getName()),Testflow001::getName,dto.getName())
.like(StrUtil.isNotBlank(dto.getNote()),Testflow001::getNote,dto.getNote())
.orderByDesc(Testflow001::getId)
.select(Testflow001.class,x -> VoToColumnUtil.fieldsToColumns(Testflow001PageVo.class).contains(x.getProperty()));
IPage<Testflow001> page = testflow001Service.page(ConventPage.getPage(dto), queryWrapper);
PageOutput<Testflow001PageVo> pageOutput = ConventPage.getPageOutput(page, Testflow001PageVo.class);
return R.ok(pageOutput);
}
@GetMapping(value = "/info")
@ApiOperation(value="根据id查询Testflow001信息")
@SaCheckPermission("testflow001:detail")
public R info(@RequestParam Long id){
Testflow001 testflow001 = testflow001Service.getById(id);
if (testflow001 == null) {
return R.error("找不到此数据！");
}
return R.ok(BeanUtil.toBean(testflow001, Testflow001Vo.class));
}
@GetMapping(value = "/datalog")
@ApiOperation(value="根据id查询Testflow001数据详细日志")
@SaCheckPermission("testflow001:datalog")
public R datalog(@RequestParam Long id){
List<DataChangeLogVo> logs = dataService.findLogsByEntityId(UpdateTestflow001Dto.class,id);
return R.ok(logs);
}
@PostMapping
@ApiOperation(value = "新增Testflow001")
@SaCheckPermission("testflow001:add")
public R add(@Valid @RequestBody UpdateTestflow001Dto dto){
codeRuleClient.useEncode("TestCode");
UpdateTestflow001Dto res = dataService.insert(dto);
return R.ok(res.getId());
}
@PutMapping
@ApiOperation(value = "修改Testflow001")
@SaCheckPermission("testflow001:edit")
public R update(@Valid @RequestBody UpdateTestflow001Dto dto){
return R.ok(dataService.updateById(dto));
}
@DeleteMapping
@ApiOperation(value = "删除")
@SaCheckPermission("testflow001:delete")
public R delete(@Valid @RequestBody List<Long> ids){
return R.ok(dataService.deleteByIds(UpdateTestflow001Dto.class, ids));
}
}

118
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/Testflow003Controller.java Normal file
View File

@ -0,0 +1,118 @@
package com.xjrsoft.module.mdm.controller;
import java.util.List;
import javax.validation.Valid;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.mdm.dto.Testflow003PageDto;
import com.xjrsoft.module.mdm.dto.UpdateTestflow003Dto;
import com.xjrsoft.module.mdm.entity.Testflow003;
import com.xjrsoft.module.mdm.service.ITestflow003Service;
import com.xjrsoft.module.mdm.vo.Testflow003PageVo;
import com.xjrsoft.module.mdm.vo.Testflow003Vo;
import com.xjrsoft.module.system.client.ICodeRuleClient;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
/**
* @title: 测试流程3
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@RestController
@RequestMapping("/mdm" + "/testflow003")
@Api(value = "/mdm" + "/testflow003",tags = "测试流程3代码")
@AllArgsConstructor
public class Testflow003Controller {
private final ITestflow003Service testflow003Service;
private final ICodeRuleClient codeRuleService;
private final DatalogService dataService;
@GetMapping(value = "/page")
@ApiOperation(value="Testflow003列表(分页)")
@SaCheckPermission("testflow003:list")
public R page(@Valid Testflow003PageDto dto){
LambdaQueryWrapper<Testflow003> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper
.like(StrUtil.isNotBlank(dto.getName()),Testflow003::getName,dto.getName())
.like(StrUtil.isNotBlank(dto.getCode()),Testflow003::getCode,dto.getCode())
.like(StrUtil.isNotBlank(dto.getNote()),Testflow003::getNote,dto.getNote())
.orderByDesc(Testflow003::getId)
.select(Testflow003.class,x -> VoToColumnUtil.fieldsToColumns(Testflow003PageVo.class).contains(x.getProperty()));
IPage<Testflow003> page = testflow003Service.page(ConventPage.getPage(dto), queryWrapper);
PageOutput<Testflow003PageVo> pageOutput = ConventPage.getPageOutput(page, Testflow003PageVo.class);
return R.ok(pageOutput);
}
@GetMapping(value = "/info")
@ApiOperation(value="根据id查询Testflow003信息")
@SaCheckPermission("testflow003:detail")
public R info(@RequestParam Long id){
Testflow003 testflow003 = testflow003Service.getById(id);
if (testflow003 == null) {
return R.error("找不到此数据！");
}
return R.ok(BeanUtil.toBean(testflow003, Testflow003Vo.class));
}
@GetMapping(value = "/datalog")
@ApiOperation(value="根据id查询Testflow003数据详细日志")
@SaCheckPermission("testflow003:datalog")
public R datalog(@RequestParam Long id){
List<DataChangeLogVo> logs = dataService.findLogsByEntityId(UpdateTestflow003Dto.class,id);
return R.ok(logs);
}
@PostMapping
@ApiOperation(value = "新增Testflow003")
@SaCheckPermission("testflow003:add")
public R add(@Valid @RequestBody UpdateTestflow003Dto dto){
codeRuleService.useEncode("TestCode");
UpdateTestflow003Dto res = dataService.insert(dto,null);
return R.ok(res.getId());
}
@PutMapping
@ApiOperation(value = "修改Testflow003")
@SaCheckPermission("testflow003:edit")
public R update(@Valid @RequestBody UpdateTestflow003Dto dto){
return R.ok(dataService.updateById(dto));
}
@DeleteMapping
@ApiOperation(value = "删除")
@SaCheckPermission("testflow003:delete")
public R delete(@Valid @RequestBody List<Long> ids){
return R.ok(dataService.deleteByIds(UpdateTestflow003Dto.class, ids));
}
}

115
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/Testflow001.java Normal file
View File

@ -0,0 +1,115 @@
package com.xjrsoft.module.mdm.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.Version;
import com.github.yulichang.annotation.EntityMapping;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
/**
* @title: 测试流程
* @Author 管理员
* @Date: 2025-11-25
* @Version 1.0
*/
@Data
@TableName("testflow_001")
@ApiModel(value = "测试流程对象", description = "测试流程")
public class Testflow001 implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@ApiModelProperty("")
@TableId
private Long id;
/**
* 客户
*/
@ApiModelProperty("客户")
private String customer;
/**
* 客户编码
*/
@ApiModelProperty("客户编码")
private String customerCode;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
/**
*
*/
@ApiModelProperty("")
@TableField(fill = FieldFill.INSERT)
private Long createUserId;
/**
*
*/
@ApiModelProperty("")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createDate;
/**
*
*/
@ApiModelProperty("")
@TableField(fill = FieldFill.UPDATE)
private Long modifyUserId;
/**
*
*/
@ApiModelProperty("")
@TableField(fill = FieldFill.UPDATE)
private LocalDateTime modifyDate;
/**
*
*/
@ApiModelProperty("")
@TableField(fill = FieldFill.INSERT)
@TableLogic
private Integer deleteMark;
/**
*
*/
@ApiModelProperty("")
@TableField(fill = FieldFill.INSERT)
private Integer enabledMark;
/**
*
*/
@ApiModelProperty("")
private Long tenantId;
}

109
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/Testflow003.java Normal file
View File

@ -0,0 +1,109 @@
package com.xjrsoft.module.mdm.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.Version;
import com.github.yulichang.annotation.EntityMapping;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
/**
* @title: 测试流程3
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
@TableName("testflow_003")
@ApiModel(value = "测试流程3对象", description = "测试流程3")
public class Testflow003 implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@ApiModelProperty("")
@TableId
private Long id;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 编码
*/
@ApiModelProperty("编码")
private String code;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
/**
*
*/
@ApiModelProperty("")
@TableField(fill = FieldFill.INSERT)
private Long createUserId;
/**
*
*/
@ApiModelProperty("")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createDate;
/**
*
*/
@ApiModelProperty("")
@TableField(fill = FieldFill.UPDATE)
private Long modifyUserId;
/**
*
*/
@ApiModelProperty("")
@TableField(fill = FieldFill.UPDATE)
private LocalDateTime modifyDate;
/**
*
*/
@ApiModelProperty("")
@TableField(fill = FieldFill.INSERT)
@TableLogic
private Integer deleteMark;
/**
*
*/
@ApiModelProperty("")
@TableField(fill = FieldFill.INSERT)
private Integer enabledMark;
/**
*
*/
@ApiModelProperty("")
private Long tenantId;
}

17
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/Testflow001Mapper.java Normal file
View File

@ -0,0 +1,17 @@
package com.xjrsoft.module.mdm.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.module.mdm.entity.Testflow001;
import org.apache.ibatis.annotations.Mapper;
/**
* @title: mapper
* @Author 管理员
* @Date: 2025-11-25
* @Version 1.0
*/
@Mapper
public interface Testflow001Mapper extends BaseMapper<Testflow001> {
}

17
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/Testflow003Mapper.java Normal file
View File

@ -0,0 +1,17 @@
package com.xjrsoft.module.mdm.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.module.mdm.entity.Testflow003;
import org.apache.ibatis.annotations.Mapper;
/**
* @title: mapper
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Mapper
public interface Testflow003Mapper extends BaseMapper<Testflow003> {
}

19
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ITestflow001Service.java Normal file
View File

@ -0,0 +1,19 @@
package com.xjrsoft.module.mdm.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.yulichang.base.MPJBaseService;
import com.github.yulichang.extension.mapping.base.MPJDeepService;
import com.github.yulichang.extension.mapping.base.MPJRelationService;
import com.xjrsoft.module.mdm.entity.Testflow001;
import lombok.Data;
import java.util.List;
/**
* @title: service
* @Author 管理员
* @Date: 2025-11-25
* @Version 1.0
*/
public interface ITestflow001Service extends IService<Testflow001> {
}

19
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ITestflow003Service.java Normal file
View File

@ -0,0 +1,19 @@
package com.xjrsoft.module.mdm.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.yulichang.base.MPJBaseService;
import com.github.yulichang.extension.mapping.base.MPJDeepService;
import com.github.yulichang.extension.mapping.base.MPJRelationService;
import com.xjrsoft.module.mdm.entity.Testflow003;
import lombok.Data;
import java.util.List;
/**
* @title: service
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
public interface ITestflow003Service extends IService<Testflow003> {
}

25
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/Testflow001ServiceImpl.java Normal file
View File

@ -0,0 +1,25 @@
package com.xjrsoft.module.mdm.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.xjrsoft.module.mdm.entity.Testflow001;
import com.xjrsoft.module.mdm.mapper.Testflow001Mapper;
import com.xjrsoft.module.mdm.service.ITestflow001Service;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
/**
* @title: service
* @Author 管理员
* @Date: 2025-11-25
* @Version 1.0
*/
@Service
@AllArgsConstructor
public class Testflow001ServiceImpl extends ServiceImpl<Testflow001Mapper, Testflow001> implements ITestflow001Service {
}

25
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/Testflow003ServiceImpl.java Normal file
View File

@ -0,0 +1,25 @@
package com.xjrsoft.module.mdm.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.xjrsoft.module.mdm.entity.Testflow003;
import com.xjrsoft.module.mdm.mapper.Testflow003Mapper;
import com.xjrsoft.module.mdm.service.ITestflow003Service;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
/**
* @title: service
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Service
@AllArgsConstructor
public class Testflow003ServiceImpl extends ServiceImpl<Testflow003Mapper, Testflow003> implements ITestflow003Service {
}

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

@ -125,9 +125,9 @@ public class CustomerController {
@Override
public UpdateLngCustomerDto after(DataOperationContent<UpdateLngCustomerDto> content) {
String msg = CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue());
if (StringUtils.isNotBlank(msg)) {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
}
if (StringUtils.isNotBlank(msg)) {
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
}
codeRuleClient.useEncode(CUSTOMER_CODE);
return content.getObj();
}

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerAttrPower.java
View File

@ -22,7 +22,7 @@ import lombok.Data;
*/
@Data
@TableName("lng_customer_attr_power")
@ApiModel(value = "客户对象", description = "客户")
@ApiModel(value = "客户业务信息", description = "客户")
public class LngCustomerAttrPower implements Serializable {
private static final long serialVersionUID = 1L;

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerBank.java
View File

@ -25,7 +25,7 @@ import java.util.List;
*/
@Data
@TableName("lng_customer_bank")
@ApiModel(value = "客户对象", description = "客户")
@ApiModel(value = "客户银行信息", description = "客户")
public class LngCustomerBank implements Serializable {
private static final long serialVersionUID = 1L;

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerContact.java
View File

@ -25,7 +25,7 @@ import java.util.List;
*/
@Data
@TableName("lng_customer_contact")
@ApiModel(value = "客户对象", description = "客户")
@ApiModel(value = "客户-联系人", description = "客户")
public class LngCustomerContact implements Serializable {
private static final long serialVersionUID = 1L;

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngCustomerDoc.java
View File

@ -29,7 +29,7 @@ import lombok.Data;
*/
@Data
@TableName("lng_customer_doc")
@ApiModel(value = "客户对象", description = "客户")
@ApiModel(value = "客户-资质证书", description = "客户")
public class LngCustomerDoc implements Serializable {
private static final long serialVersionUID = 1L;