diff --git a/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-archiver/pom.properties b/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-archiver/pom.properties deleted file mode 100644 index a62939d..0000000 --- a/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-archiver/pom.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Generated by Maven -#Wed Sep 24 16:46:40 CST 2025 -version=2.0.4 -groupId=com.geg -artifactId=itc-pcitc-demo-api diff --git a/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst deleted file mode 100644 index e69de29..0000000 diff --git a/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst deleted file mode 100644 index 12f0e49..0000000 --- a/itc-pcitc-demo/itc-pcitc-demo-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ /dev/null @@ -1,16 +0,0 @@ -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\prdManage\vo\DemoApplianceVo.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\prdManage\client\IDemoApplianceClient.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\dev\vo\Testfrom4Vo.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\relationManage\dto\DemoCustomerPageDto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\relationManage\dto\AddDemoCustomerDto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\relationManage\dto\UpdateDemoCustomerDto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\dev\dto\AddTestfrom4Dto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\prdManage\dto\AddDemoApplianceDto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\relationManage\vo\DemoCustomerVo.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\dev\vo\Testfrom4PageVo.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\prdManage\dto\DemoAppliancePageDto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\prdManage\vo\DemoAppliancePageVo.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\dev\dto\Testfrom4PageDto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\dev\dto\UpdateTestfrom4Dto.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\relationManage\vo\DemoCustomerPageVo.java -F:\ges-scm\code\dev\geg-gas-pcitc\itc-pcitc-demo\itc-pcitc-demo-api\src\main\java\com\xjrsoft\module\prdManage\dto\UpdateDemoApplianceDto.java diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/test/controller/CallTest.java b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/test/controller/CallTest.java index f391208..a3d2c2c 100644 --- a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/test/controller/CallTest.java +++ b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/test/controller/CallTest.java @@ -1,6 +1,7 @@ package com.xjrsoft.module.test.controller; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -10,6 +11,7 @@ import com.xjrsoft.common.model.result.R; import com.xjrsoft.module.common.db.service.CommonCallService; import com.xjrsoft.module.dev.entity.Testfrom3; import com.xjrsoft.module.dev.vo.Testfrom3Vo; +import com.xjrsoft.module.system.client.ICodeRuleClient; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; @@ -24,6 +26,9 @@ public class CallTest { @Autowired private CommonCallService callService; + @Autowired + private ICodeRuleClient client; + @GetMapping(value = "/fSave") @ApiOperation(value="根据id查询Testfrom3信息") public R info(){ @@ -31,5 +36,19 @@ public class CallTest { System.out.println(out); return R.ok(null); } + + + @GetMapping(value = "/CodeRule") + @ApiOperation(value="根据id查询Testfrom3信息") + public R CodeRule(){ + String code = genEncode(); + System.out.println(code); + return R.ok(null); + } + + @Transactional + public String genEncode() { + return client.genEncode("bankCode"); + } } diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/FieldNameConstants.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/FieldNameConstants.java index b0cf92a..5bf18b3 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/FieldNameConstants.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-api/src/main/java/com/pictc/constant/FieldNameConstants.java @@ -21,4 +21,9 @@ public interface FieldNameConstants { * 本币 */ String LOCAL_SIGN = "本币"; + + /** + * 简称 + */ + String SHORT_NAME = "简称名称"; } diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java index c6a12f7..55a9634 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/utils/DataLogTools.java @@ -322,7 +322,7 @@ public class DataLogTools { T dto = (T)tabInfo.toDto(entity); DataChangeLog datalog = createLog(klazz,OperationType.UPDATE); datalog.setEntityId(id); - buildFields(datalog,tabInfo,dto,null); + buildFields(datalog,tabInfo,dto,tabInfo.toDto(old)); logs.add(datalog); saveLogs(tabInfo,logs); return dto; @@ -330,7 +330,7 @@ public class DataLogTools { public static boolean disable(Class klazz, @Valid List ids) { for (Long id : ids) { - enableById(klazz, id); + disableById(klazz, id); } return true; } @@ -348,7 +348,7 @@ public class DataLogTools { T dto = (T)tabInfo.toDto(entity); DataChangeLog datalog = createLog(klazz,OperationType.UPDATE); datalog.setEntityId(id); - buildFields(datalog,tabInfo,dto,null); + buildFields(datalog,tabInfo,dto,tabInfo.toDto(old)); logs.add(datalog); saveLogs(tabInfo,logs); return dto; @@ -820,7 +820,7 @@ public class DataLogTools { String sql = parseSql(SQL_LIST, tableName); JdbcContext context = null; try { - context = new JdbcContext(true,false); + context = new JdbcContext(true,true); context.init(sql); context.setParams(ListUtils.ofArray(JdbcParam.ofLong(dataId))); ResultSet set = context.executeQuery(); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBFeeDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBFeeDto.java new file mode 100644 index 0000000..74e50f2 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBFeeDto.java @@ -0,0 +1,68 @@ +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: 费用名称 +* @Author 管理员 +* @Date: 2025-10-23 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_b_fee",name="费用名称") +public class AddLngBFeeDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 助记码 + */ + @ApiModelProperty("助记码") + @LogField(name="助记码",index=0) + private String code; + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + @LogField(name="名称(不能重复)",index=0) + private String fullName; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + @LogField(name="显示顺序",index=0) + private Short sort; + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + @LogField(name="有效标志(Y-有效，N-无效)",index=0) + private String valid; + /** + * 备注 + */ + @ApiModelProperty("备注") + @LogField(name="备注",index=0) + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + @LogField(name="租户id",index=0) + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBTaxDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBTaxDto.java new file mode 100644 index 0000000..36530b1 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddLngBTaxDto.java @@ -0,0 +1,74 @@ +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: 税率 +* @Author 管理员 +* @Date: 2025-10-23 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_b_tax",name="税率") +public class AddLngBTaxDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 助记码(17/13/9/6/0) + */ + @ApiModelProperty("助记码(17/13/9/6/0)") + @LogField(name="助记码(17/13/9/6/0)",index=0) + private String code; + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + @LogField(name="名称(不能重复)",index=0) + private String fullName; + /** + * 税率% + */ + @ApiModelProperty("税率%") + @LogField(name="税率%",index=0) + private BigDecimal rate; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + @LogField(name="显示顺序",index=0) + private Short sort; + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + @LogField(name="有效标志(Y-有效，N-无效)",index=0) + private String valid; + /** + * 备注 + */ + @ApiModelProperty("备注") + @LogField(name="备注",index=0) + private String note; + /** + * 租户id + */ + @ApiModelProperty("租户id") + @LogField(name="租户id",index=0) + private Long tenantId; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBFeePageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBFeePageDto.java new file mode 100644 index 0000000..0436c9e --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBFeePageDto.java @@ -0,0 +1,50 @@ +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-10-23 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngBFeePageDto extends PageInput { + + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + /** + * 助记码 + */ + @ApiModelProperty("助记码") + private String code; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBTaxPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBTaxPageDto.java new file mode 100644 index 0000000..9755c5a --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/LngBTaxPageDto.java @@ -0,0 +1,55 @@ +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-10-23 +* @Version 1.0 +*/ +@Data +@EqualsAndHashCode(callSuper = false) +public class LngBTaxPageDto extends PageInput { + + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + /** + * 助记码(17/13/9/6/0) + */ + @ApiModelProperty("助记码(17/13/9/6/0)") + private String code; + /** + * 税率% + */ + @ApiModelProperty("税率%") + private BigDecimal rate; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBFeeDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBFeeDto.java new file mode 100644 index 0000000..a9f8155 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBFeeDto.java @@ -0,0 +1,86 @@ +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: 费用名称 +* @Author 管理员 +* @Date: 2025-10-23 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_b_fee",name="费用名称") +public class UpdateLngBFeeDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 助记码 + */ + @LogField(name="助记码",index=1) + @ApiModelProperty("助记码") + private String code; + + /** + * 名称(不能重复) + */ + @LogField(name="名称(不能重复)",index=2) + @ApiModelProperty("名称(不能重复)") + private String fullName; + + /** + * 显示顺序 + */ + @LogField(name="显示顺序",index=3) + @ApiModelProperty("显示顺序") + private Short sort; + + /** + * 有效标志(Y-有效，N-无效) + */ + @LogField(name="有效标志(Y-有效，N-无效)",index=4) + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + + /** + * 备注 + */ + @LogField(name="备注",index=5) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=6) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBTaxDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBTaxDto.java new file mode 100644 index 0000000..c5a5650 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateLngBTaxDto.java @@ -0,0 +1,93 @@ +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: 税率 +* @Author 管理员 +* @Date: 2025-10-23 +* @Version 1.0 +*/ +@Data +@LogTable(source="lng_b_tax",name="税率") +public class UpdateLngBTaxDto implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @LogField(name="主键",index=0) + @ApiModelProperty("主键") + private Long id; + + /** + * 助记码(17/13/9/6/0) + */ + @LogField(name="助记码(17/13/9/6/0)",index=1) + @ApiModelProperty("助记码(17/13/9/6/0)") + private String code; + + /** + * 名称(不能重复) + */ + @LogField(name="名称(不能重复)",index=2) + @ApiModelProperty("名称(不能重复)") + private String fullName; + + /** + * 税率% + */ + @LogField(name="税率%",index=3) + @ApiModelProperty("税率%") + private BigDecimal rate; + + /** + * 显示顺序 + */ + @LogField(name="显示顺序",index=4) + @ApiModelProperty("显示顺序") + private Short sort; + + /** + * 有效标志(Y-有效，N-无效) + */ + @LogField(name="有效标志(Y-有效，N-无效)",index=5) + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + + /** + * 备注 + */ + @LogField(name="备注",index=6) + @ApiModelProperty("备注") + private String note; + + /** + * 租户id + */ + @LogField(name="租户id",index=7) + @ApiModelProperty("租户id") + private Long tenantId; + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java index e75ca06..fe0e8e1 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java @@ -65,5 +65,11 @@ public class LngBBankPageVo { */ @ApiModelProperty("数据权限id") private Long ruleUserId; + + /** + * 所属国家和地区 + */ + @ApiModelProperty("所属国家和地区名称") + private String regionName; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBFeePageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBFeePageVo.java new file mode 100644 index 0000000..4a5d2d3 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBFeePageVo.java @@ -0,0 +1,54 @@ +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-10-23 +* @Version 1.0 +*/ +@Data +public class LngBFeePageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 助记码 + */ + @ApiModelProperty("助记码") + private String code; + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + @Trans(type = TransType.DIC, id = "1978057078528327681") + private String valid; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBFeeVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBFeeVo.java new file mode 100644 index 0000000..db1fd09 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBFeeVo.java @@ -0,0 +1,114 @@ +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-10-23 +* @Version 1.0 +*/ +@Data +public class LngBFeeVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 助记码 + */ + @ApiModelProperty("助记码") + private String code; + + + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + + + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBTaxPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBTaxPageVo.java new file mode 100644 index 0000000..a0a0fb1 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBTaxPageVo.java @@ -0,0 +1,59 @@ +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-10-23 +* @Version 1.0 +*/ +@Data +public class LngBTaxPageVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private String id; + /** + * 助记码(17/13/9/6/0) + */ + @ApiModelProperty("助记码(17/13/9/6/0)") + private String code; + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + /** + * 税率% + */ + @ApiModelProperty("税率%") + private BigDecimal rate; + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + @Trans(type = TransType.DIC, id = "1978057078528327681") + private String valid; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBTaxVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBTaxVo.java new file mode 100644 index 0000000..d0de551 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBTaxVo.java @@ -0,0 +1,121 @@ +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-10-23 +* @Version 1.0 +*/ +@Data +public class LngBTaxVo { + + /** + * 主键 + */ + @ApiModelProperty("主键") + private Long id; + + + /** + * 助记码(17/13/9/6/0) + */ + @ApiModelProperty("助记码(17/13/9/6/0)") + private String code; + + + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + + + /** + * 税率% + */ + @ApiModelProperty("税率%") + private BigDecimal rate; + + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + + + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private Long createUserId; + + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + private LocalDateTime createDate; + + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + private Long modifyUserId; + + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + private LocalDateTime modifyDate; + + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Long deptId; + + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + private Long ruleUserId; + + + + + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java index f7e1ebe..e3c9021 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java @@ -26,12 +26,15 @@ import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.dto.LngBBankPageDto; import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; import com.xjrsoft.module.mdm.entity.LngBBank; +import com.xjrsoft.module.mdm.entity.LngBRegion; import com.xjrsoft.module.mdm.service.IBankService; +import com.xjrsoft.module.mdm.service.ICountryRegionService; import com.xjrsoft.module.mdm.vo.LngBBankPageVo; import com.xjrsoft.module.mdm.vo.LngBBankVo; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -52,6 +55,8 @@ public class BankController { private final IBankService bankService; private final DatalogService dataService; + + private final ICountryRegionService regionService; @GetMapping(value = "/page") @ApiOperation(value="LngBBank列表(分页)") @@ -71,10 +76,15 @@ public class BankController { .select(LngBBank.class,x -> VoToColumnUtil.fieldsToColumns(LngBBankPageVo.class).contains(x.getProperty())); IPage page = bankService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBBankPageVo.class); + List list = pageOutput.getList(); + setRegionName(list); + return R.ok(pageOutput); } - @GetMapping(value = "/info") + + + @GetMapping(value = "/info") @ApiOperation(value="根据id查询LngBBank信息") @SaCheckPermission("bank:detail") public R info(@RequestParam Long id){ @@ -147,4 +157,24 @@ public class BankController { public R disable(@Valid @RequestBody List ids){ return R.ok(bankService.disable(ids)); } + + private void setRegionName(List list) { + if(CollectionUtil.isNotEmpty(list)) { + for(LngBBankPageVo vo: list) { + if(StrUtil.isNotBlank(vo.getRegionCode())) { + String[] regionArr = vo.getRegionCode().split(","); + if(regionArr != null && regionArr.length > 0) { + String lastRegionCode = regionArr[regionArr.length-1]; + LambdaQueryWrapper regionQueryWrapper = new LambdaQueryWrapper<>(); + regionQueryWrapper.eq(LngBRegion::getCode, lastRegionCode); + LngBRegion lastRegion = regionService.getOne(regionQueryWrapper); + if(lastRegion != null) { + vo.setRegionName(lastRegion.getFullPath()); + } + } + + } + } + } + } } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java index 2bfee53..b3170af 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java @@ -15,7 +15,10 @@ import org.springframework.web.bind.annotation.RestController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.pictc.enums.ValidEnum; import com.pictc.utils.CollectionUtils; +import com.xjrsoft.common.constant.GlobalConstant; import com.xjrsoft.common.enums.YesOrNoEnum; import com.xjrsoft.common.model.result.R; import com.xjrsoft.common.page.ConventPage; @@ -27,7 +30,6 @@ import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.dto.LngBRegionPageDto; import com.xjrsoft.module.mdm.dto.UpdateLngBRegionDto; import com.xjrsoft.module.mdm.entity.LngBRegion; -import com.xjrsoft.module.mdm.enums.CountryRegionEnum; import com.xjrsoft.module.mdm.service.ICountryRegionService; import com.xjrsoft.module.mdm.vo.LngBRegionPageVo; import com.xjrsoft.module.mdm.vo.LngBRegionTreeVo; @@ -48,7 +50,7 @@ import lombok.AllArgsConstructor; * @Version 1.0 */ @RestController -@RequestMapping("/mdm" + "/countryRegion") +@RequestMapping("/mdm/countryRegion") @Api(value = "/mdm" + "/countryRegion",tags = "国家地区代码") @AllArgsConstructor public class CountryRegionController { @@ -140,7 +142,7 @@ public class CountryRegionController { if(br.getPid() != null) { vo.setParentId(String.valueOf(br.getPid()) ); }else { - vo.setParentId("0"); + vo.setParentId(String.valueOf(GlobalConstant.FIRST_NODE_VALUE)); } voList.add(vo); @@ -155,6 +157,7 @@ public class CountryRegionController { @SaCheckPermission("countryRegion:enable") public R enable(@Valid @RequestBody List ids){ return R.ok(countryRegionService.enable(ids)); + } @@ -164,4 +167,19 @@ public class CountryRegionController { public R disable(@Valid @RequestBody List ids){ return R.ok(countryRegionService.disable(ids)); } + + @GetMapping("/child") + @ApiOperation(value = "根据id 查询下级区域") + public R getRegionByParentId(@RequestParam(required = false) Long pid, @RequestParam(required = false) String keyword) { + List regionList = countryRegionService.list(Wrappers.query().lambda() + .eq(pid != null, LngBRegion::getPid, pid) + .eq(LngBRegion::getValid, ValidEnum.ENABLE.getCode()) + .eq(pid == null, LngBRegion::getPid, GlobalConstant.FIRST_NODE_VALUE) + .and(StrUtil.isNotBlank(keyword), x -> { + x.like(StrUtil.isNotBlank(keyword), LngBRegion::getFullName, keyword); + })); + + List resultList = BeanUtil.copyToList(regionList, LngBRegionVo.class); + return R.ok(resultList); + } } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java new file mode 100644 index 0000000..f6c666d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java @@ -0,0 +1,105 @@ +package com.xjrsoft.module.mdm.controller; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.xjrsoft.common.constant.GlobalConstant; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.mdm.dto.AddLngBFeeDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBFeeDto; +import cn.dev33.satoken.annotation.SaCheckPermission; + +import com.xjrsoft.module.mdm.dto.LngBFeePageDto; +import com.xjrsoft.module.mdm.entity.LngBFee; +import com.xjrsoft.module.mdm.service.IExpenseNameService; +import com.xjrsoft.module.mdm.vo.LngBFeePageVo; + +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.mdm.vo.LngBFeeVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** +* @title: 费用名称 +* @Author 管理员 +* @Date: 2025-10-23 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/mdm" + "/expenseName") +@Api(value = "/mdm" + "/expenseName",tags = "费用名称代码") +@AllArgsConstructor +public class ExpenseNameController { + + + private final IExpenseNameService expenseNameService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngBFee列表(分页)") + @SaCheckPermission("expenseName:list") + public R page(@Valid LngBFeePageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .like(StrUtil.isNotBlank(dto.getFullName()),LngBFee::getFullName,dto.getFullName()) + .like(StrUtil.isNotBlank(dto.getValid()),LngBFee::getValid,dto.getValid()) + .like(StrUtil.isNotBlank(dto.getCode()),LngBFee::getCode,dto.getCode()) + //.like(StrUtil.isNotBlank(dto.getSort()),LngBFee::getSort,dto.getSort()) + .like(StrUtil.isNotBlank(dto.getNote()),LngBFee::getNote,dto.getNote()) + .orderByDesc(LngBFee::getId) + .select(LngBFee.class,x -> VoToColumnUtil.fieldsToColumns(LngBFeePageVo.class).contains(x.getProperty())); + IPage page = expenseNameService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngBFeePageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngBFee信息") + @SaCheckPermission("expenseName:detail") + public R info(@RequestParam Long id){ + LngBFee lngBFee = expenseNameService.getById(id); + if (lngBFee == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngBFee, LngBFeeVo.class)); + } + + + @PostMapping + @ApiOperation(value = "新增LngBFee") + @SaCheckPermission("expenseName:add") + public R add(@Valid @RequestBody UpdateLngBFeeDto dto){ + UpdateLngBFeeDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngBFee") + @SaCheckPermission("expenseName:edit") + public R update(@Valid @RequestBody UpdateLngBFeeDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("expenseName:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngBFeeDto.class, ids)); + + } + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java new file mode 100644 index 0000000..4011b20 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java @@ -0,0 +1,106 @@ +package com.xjrsoft.module.mdm.controller; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.xjrsoft.common.constant.GlobalConstant; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.xjrsoft.common.page.ConventPage; +import com.xjrsoft.common.page.PageOutput; +import com.xjrsoft.common.model.result.R; +import com.xjrsoft.common.utils.VoToColumnUtil; +import com.xjrsoft.module.mdm.dto.AddLngBTaxDto; +import com.xjrsoft.module.mdm.dto.UpdateLngBTaxDto; +import cn.dev33.satoken.annotation.SaCheckPermission; + +import com.xjrsoft.module.mdm.dto.LngBTaxPageDto; +import com.xjrsoft.module.mdm.entity.LngBTax; +import com.xjrsoft.module.mdm.service.ITaxRateService; +import com.xjrsoft.module.mdm.vo.LngBTaxPageVo; + +import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.mdm.vo.LngBTaxVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** +* @title: 税率 +* @Author 管理员 +* @Date: 2025-10-23 +* @Version 1.0 +*/ +@RestController +@RequestMapping("/mdm" + "/taxRate") +@Api(value = "/mdm" + "/taxRate",tags = "税率代码") +@AllArgsConstructor +public class TaxRateController { + + + private final ITaxRateService taxRateService; + private final DatalogService dataService; + + @GetMapping(value = "/page") + @ApiOperation(value="LngBTax列表(分页)") + @SaCheckPermission("taxRate:list") + public R page(@Valid LngBTaxPageDto dto){ + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper + .like(StrUtil.isNotBlank(dto.getFullName()),LngBTax::getFullName,dto.getFullName()) + .like(StrUtil.isNotBlank(dto.getValid()),LngBTax::getValid,dto.getValid()) + .like(StrUtil.isNotBlank(dto.getCode()),LngBTax::getCode,dto.getCode()) + .eq(ObjectUtil.isNotNull(dto.getRate()),LngBTax::getRate,dto.getRate()) + //.like(StrUtil.isNotBlank(dto.getSort()),LngBTax::getSort,dto.getSort()) + .like(StrUtil.isNotBlank(dto.getNote()),LngBTax::getNote,dto.getNote()) + .orderByDesc(LngBTax::getId) + .select(LngBTax.class,x -> VoToColumnUtil.fieldsToColumns(LngBTaxPageVo.class).contains(x.getProperty())); + IPage page = taxRateService.page(ConventPage.getPage(dto), queryWrapper); + PageOutput pageOutput = ConventPage.getPageOutput(page, LngBTaxPageVo.class); + return R.ok(pageOutput); + } + + @GetMapping(value = "/info") + @ApiOperation(value="根据id查询LngBTax信息") + @SaCheckPermission("taxRate:detail") + public R info(@RequestParam Long id){ + LngBTax lngBTax = taxRateService.getById(id); + if (lngBTax == null) { + return R.error("找不到此数据！"); + } + return R.ok(BeanUtil.toBean(lngBTax, LngBTaxVo.class)); + } + + + @PostMapping + @ApiOperation(value = "新增LngBTax") + @SaCheckPermission("taxRate:add") + public R add(@Valid @RequestBody UpdateLngBTaxDto dto){ + UpdateLngBTaxDto res = dataService.insert(dto); + return R.ok(res.getId()); + } + + @PutMapping + @ApiOperation(value = "修改LngBTax") + @SaCheckPermission("taxRate:edit") + public R update(@Valid @RequestBody UpdateLngBTaxDto dto){ + return R.ok(dataService.updateById(dto)); + } + + @DeleteMapping + @ApiOperation(value = "删除") + @SaCheckPermission("taxRate:delete") + public R delete(@Valid @RequestBody List ids){ + return R.ok(dataService.deleteByIds(UpdateLngBTaxDto.class, ids)); + + } + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBFee.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBFee.java new file mode 100644 index 0000000..25b4d5d --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBFee.java @@ -0,0 +1,128 @@ +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-10-23 +* @Version 1.0 +*/ +@Data +@TableName("lng_b_fee") +@ApiModel(value = "费用名称对象", description = "费用名称") +public class LngBFee implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 助记码 + */ + @ApiModelProperty("助记码") + private String code; + + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime modifyDate; + + /** + * 逻辑删除 + */ + @ApiModelProperty("逻辑删除") + @TableField(fill = FieldFill.INSERT) + @TableLogic + private Integer deleteMark; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBTax.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBTax.java new file mode 100644 index 0000000..4d183f5 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/entity/LngBTax.java @@ -0,0 +1,134 @@ +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-10-23 +* @Version 1.0 +*/ +@Data +@TableName("lng_b_tax") +@ApiModel(value = "税率对象", description = "税率") +public class LngBTax implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty("主键") + @TableId + private Long id; + + /** + * 助记码(17/13/9/6/0) + */ + @ApiModelProperty("助记码(17/13/9/6/0)") + private String code; + + /** + * 名称(不能重复) + */ + @ApiModelProperty("名称(不能重复)") + private String fullName; + + /** + * 税率% + */ + @ApiModelProperty("税率%") + private BigDecimal rate; + + /** + * 显示顺序 + */ + @ApiModelProperty("显示顺序") + private Short sort; + + /** + * 有效标志(Y-有效，N-无效) + */ + @ApiModelProperty("有效标志(Y-有效，N-无效)") + private String valid; + + /** + * 备注 + */ + @ApiModelProperty("备注") + private String note; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + @TableField(fill = FieldFill.INSERT) + private Long createUserId; + + /** + * 创建时间 + */ + @ApiModelProperty("创建时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createDate; + + /** + * 修改人id + */ + @ApiModelProperty("修改人id") + @TableField(fill = FieldFill.UPDATE) + private Long modifyUserId; + + /** + * 修改时间 + */ + @ApiModelProperty("修改时间") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime modifyDate; + + /** + * 逻辑删除 + */ + @ApiModelProperty("逻辑删除") + @TableField(fill = FieldFill.INSERT) + @TableLogic + private Integer deleteMark; + + /** + * 租户id + */ + @ApiModelProperty("租户id") + private Long tenantId; + + /** + * 部门id + */ + @ApiModelProperty("部门id") + @TableField(fill = FieldFill.INSERT) + private Long deptId; + + /** + * 数据权限id + */ + @ApiModelProperty("数据权限id") + @TableField(fill = FieldFill.INSERT) + private Long ruleUserId; + + + +} \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBFeeMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBFeeMapper.java new file mode 100644 index 0000000..8fb8e00 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBFeeMapper.java @@ -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.LngBFee; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-10-23 +* @Version 1.0 +*/ +@Mapper +public interface LngBFeeMapper extends BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBTaxMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBTaxMapper.java new file mode 100644 index 0000000..2eec347 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/mapper/LngBTaxMapper.java @@ -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.LngBTax; +import org.apache.ibatis.annotations.Mapper; + +/** +* @title: mapper +* @Author 管理员 +* @Date: 2025-10-23 +* @Version 1.0 +*/ +@Mapper +public interface LngBTaxMapper extends BaseMapper { + +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IExpenseNameService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IExpenseNameService.java new file mode 100644 index 0000000..0d1b90b --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/IExpenseNameService.java @@ -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.LngBFee; +import lombok.Data; +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-10-23 +* @Version 1.0 +*/ + +public interface IExpenseNameService extends IService { +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ITaxRateService.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ITaxRateService.java new file mode 100644 index 0000000..22bd3f9 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/ITaxRateService.java @@ -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.LngBTax; +import lombok.Data; +import java.util.List; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-10-23 +* @Version 1.0 +*/ + +public interface ITaxRateService extends IService { +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java index 4fc2c79..4ca9c05 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java @@ -18,7 +18,6 @@ import com.xjrsoft.module.common.db.service.CommonCallService; import com.xjrsoft.module.datalog.service.DatalogService; import com.xjrsoft.module.mdm.dto.UpdateLngBBankDto; import com.xjrsoft.module.mdm.entity.LngBBank; -import com.xjrsoft.module.mdm.entity.LngBRegion; import com.xjrsoft.module.mdm.mapper.LngBBankMapper; import com.xjrsoft.module.mdm.service.IBankService; import com.xjrsoft.module.system.client.ICodeRuleClient; @@ -41,14 +40,17 @@ public class BankServiceImpl extends ServiceImpl imple private final ICodeRuleClient codeRuleClient; + private final String BANKCODE = "bankCode"; + @Override @Transactional(rollbackFor = Exception.class) public Long add(UpdateLngBBankDto dto) { - String code = codeRuleClient.genEncode("bankCode"); + String code = codeRuleClient.genEncode(BANKCODE); dto.setCode(code); this.checkParams(dto); UpdateLngBBankDto res = DataLogTools.insert(dto); - //this.addOrUpdateAfter(res.getId()); + codeRuleClient.useEncode(BANKCODE); + this.addOrUpdateAfter(res.getId()); return res.getId(); } @@ -57,19 +59,35 @@ public class BankServiceImpl extends ServiceImpl imple public Long update(UpdateLngBBankDto dto) { this.checkParams(dto); UpdateLngBBankDto res = DataLogTools.update(dto); - //this.addOrUpdateAfter(res.getId()); + this.addOrUpdateAfter(res.getId()); return res.getId(); } @Override public boolean enable(List ids) { - return dataService.disable(UpdateLngBBankDto.class,ids); + DataLogTools.enable(UpdateLngBBankDto.class,ids); + for (Long id : ids) { + String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_PRICE_TERM, id); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + } + return true; } @Override public boolean disable(List ids) { - return dataService.disable(UpdateLngBBankDto.class,ids); + DataLogTools.disable(UpdateLngBBankDto.class,ids); + + for (Long id : ids) { + String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_PRICE_TERM, id); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + } + + return true; } private void checkParams(UpdateLngBBankDto dto) { @@ -79,6 +97,12 @@ public class BankServiceImpl extends ServiceImpl imple throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DATA_FIELD_DUPLICATION, FieldNameConstants.CODE)); } + Long shortNameCount = this.baseMapper.selectCount(new LambdaQueryWrapper() + .eq(LngBBank::getShortName, dto.getShortName()).ne(dto.getId() != null, LngBBank::getId, dto.getId())); + if (shortNameCount > 0) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DATA_FIELD_DUPLICATION, + FieldNameConstants.SHORT_NAME)); + } Long nameCount = this.baseMapper.selectCount(new LambdaQueryWrapper() .eq(LngBBank::getFullName, dto.getFullName()).ne(dto.getId() != null, LngBBank::getId, dto.getId())); if (nameCount > 0) { diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java index d9ceede..b82d797 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java @@ -59,13 +59,27 @@ public class CountryRegionServiceImpl extends ServiceImpl ids) { - return dataService.disable(UpdateLngBRegionDto.class,ids); + dataService.enable(UpdateLngBRegionDto.class,ids); + for (Long id : ids) { + String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_PRICE_TERM, id); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + } + return true; } @Override public boolean disable(List ids) { - return dataService.disable(UpdateLngBRegionDto.class,ids); + dataService.disable(UpdateLngBRegionDto.class,ids); + for (Long id : ids) { + String msg = commonCallService.enableBefore(TableNameConstants.LNG_B_PRICE_TERM, id); + if (StringUtils.isNotBlank(msg)) { + throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg)); + } + } + return true; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/ExpenseNameServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/ExpenseNameServiceImpl.java new file mode 100644 index 0000000..2dbc5d1 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/ExpenseNameServiceImpl.java @@ -0,0 +1,21 @@ +package com.xjrsoft.module.mdm.service.impl; + +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.xjrsoft.module.mdm.entity.LngBFee; +import com.xjrsoft.module.mdm.mapper.LngBFeeMapper; +import com.xjrsoft.module.mdm.service.IExpenseNameService; + +import lombok.AllArgsConstructor; + +/** +* @title: service +* @Author 管理员 +* @Date: 2025-10-23 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class ExpenseNameServiceImpl extends ServiceImpl implements IExpenseNameService { +} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java new file mode 100644 index 0000000..d0a72d7 --- /dev/null +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java @@ -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.LngBTax; +import com.xjrsoft.module.mdm.mapper.LngBTaxMapper; +import com.xjrsoft.module.mdm.service.ITaxRateService; +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-10-23 +* @Version 1.0 +*/ +@Service +@AllArgsConstructor +public class TaxRateServiceImpl extends ServiceImpl implements ITaxRateService { +}