修改bug

commons/src/main/java/com/jzg/commons/entity/dto/AgreementAddParam.java

@@ -68,7 +68,7 @@ public class AgreementAddParam {
     private String dockingPerson;
 
     @Schema(description = "api类型")
-//    @NotNull(message = "请选择api类型")
+    @NotNull(message = "请选择api类型")
     private Integer apiType;
 
     @Schema(description = "联系方式（对接人）")

commons/src/main/java/com/jzg/commons/entity/scheme/vo/PtlSchemeSaveVo.java

@@ -210,7 +210,7 @@ public class PtlSchemeSaveVo {
 
     private String inputNumberIdentifying(PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr, PtlAgreementUndwrtRulesAttr ptlAgreementProductCostsAttrLink) {
         if ("1".equals(ptlAgreementProductCostsAttrLink.getOperator())) {
-            return ptlAgreementUndwrtRulesAttr.getAttrCode() + "范围值" + ptlAgreementProductCostsAttrLink.getMin() + "到" + ptlAgreementProductCostsAttrLink.getMax();
+            return ptlAgreementUndwrtRulesAttr.getAttrName() + "范围值" + ptlAgreementProductCostsAttrLink.getMin() + "到" + ptlAgreementProductCostsAttrLink.getMax();
         } else if ("2".equals(ptlAgreementProductCostsAttrLink.getOperator())) {
             return ptlAgreementUndwrtRulesAttr.getAttrName() + "小于" + ptlAgreementProductCostsAttrLink.getMin();
         } else if ("3".equals(ptlAgreementProductCostsAttrLink.getOperator())) {

commons/src/main/java/com/jzg/commons/entity/vo/AgreementVo.java

@@ -93,6 +93,10 @@ public class AgreementVo extends BaseModel {
     @Schema(description = "审核状态 0 申请审核 1 审核通过 2 审核不通过")
     private String auditStatus;
 
+    /** api类型 **/
+    @Schema(description = "api类型")
+    private String apiType;
+
     /** 序号 */
     @Schema(description = "序号")
     private Integer serialNumber;

platform/src/main/java/com/jzg/controller/SysSystemController.java

@@ -135,8 +135,13 @@ public class SysSystemController {
     @GetMapping(value = { "/userGet"})
     @Operation(summary = "根据手机号获取用户信息")
     public HttpResult userGet(String mobile) {
-        return HttpResult.ok(sysUserService.list(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getMobile, mobile)));
+        List<SysUser> list = sysUserService.list(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getMobile, mobile));
+        list.forEach(item->{
+            item.setPassword("password");
+            item.setSalt("salt");
+        });
+        return HttpResult.ok(list);
     }
 
     /**

tenant/organization/src/main/java/com/jzg/organization/controller/PtlAgreementCostController.java

@@ -84,7 +84,8 @@ public class PtlAgreementCostController {
     @Operation(summary = "费用管理分页列表")
     @PostMapping("pageList")
     public HttpResult<CostManagementVo> pageList(@RequestBody PtlAgreementCostParam costParam){
-        return ptlAgreementCostService.pageList(costParam);
+        HttpResult httpResult = ptlAgreementCostService.pageList(costParam);
+        return httpResult;
     }
 
 }

tenant/organization/src/main/java/com/jzg/organization/mapper/PtlAgreementCostMapper.java

@@ -25,6 +25,6 @@ public interface PtlAgreementCostMapper extends BaseMapper<PtlAgreementCost> {
     Page<CostManagementVo> pageList(Page page,@Param("costParam") PtlAgreementCostParam costParam);
 
 
-    PtlAgreementCostVo selectById(@Param("id") Long id);
+//    PtlAgreementCostVo selectById(@Param("id") Long id);
 
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementCostServiceImpl.java

@@ -278,7 +278,16 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
 
     @Override
     public HttpResult pageList(PtlAgreementCostParam costParam) {
-        return HttpResult.ok(baseMapper.pageList(costParam.getPage(),costParam));
+        Page<CostManagementVo> costManagementVoPage = baseMapper.pageList(costParam.getPage(), costParam);
+        costManagementVoPage.getRecords().forEach(item->{
+            if(item.getCostRules() != null && !item.getCostRules().equals("")){
+                item.setCostRules(item.getCostRules().substring(0,item.getCostRules().length()-1));
+            }
+            if(item.getRuleDescription() != null && !item.getRuleDescription().equals("")){
+                item.setRuleDescription(item.getRuleDescription().substring(0,item.getRuleDescription().length()-1));
+            }
+        });
+        return HttpResult.ok(costManagementVoPage);
     }
 
 

tenant/organization/src/main/resources/mapper/PtlAgreementCostMapper.xml

@@ -321,35 +321,35 @@
         order by pc.create_time desc
     </select>
 
-    <select id="selectById" resultMap="BaseResultMap">
-        SELECT
-        t.id,
-        t.ptl_agreement_id,
-        t.product_name,
-        t.product_id,
-        t.effective_time,
-        t.failure_time,
-        t.audit_method,
-        t.cost_describe,
-        t.is_delete,
-        t.create_by,
-        t.create_time,
-        t.update_by,
-        t.update_time,
-        t.audit_person,
-        t.review_description,
-        t.audit_time,
-        pa.agreement_code,
-        pa.agreement_title
-        FROM
-        ptl_agreement_cost t
-        LEFT JOIN ptl_agreement pa ON pa.id = t.ptl_agreement_id
-        <where>
-            t.is_delete = 0
-            <if test="id != null">
-                AND t.id = #{id}
-            </if>
-        </where>
-    </select>
+<!--    <select id="selectById" resultMap="BaseResultMap">-->
+<!--        SELECT-->
+<!--        t.id,-->
+<!--        t.ptl_agreement_id,-->
+<!--        t.product_name,-->
+<!--        t.product_id,-->
+<!--        t.effective_time,-->
+<!--        t.failure_time,-->
+<!--        t.audit_method,-->
+<!--        t.cost_describe,-->
+<!--        t.is_delete,-->
+<!--        t.create_by,-->
+<!--        t.create_time,-->
+<!--        t.update_by,-->
+<!--        t.update_time,-->
+<!--        t.audit_person,-->
+<!--        t.review_description,-->
+<!--        t.audit_time,-->
+<!--        pa.agreement_code,-->
+<!--        pa.agreement_title-->
+<!--        FROM-->
+<!--        ptl_agreement_cost t-->
+<!--        LEFT JOIN ptl_agreement pa ON pa.id = t.ptl_agreement_id-->
+<!--        <where>-->
+<!--            t.is_delete = 0-->
+<!--            <if test="id != null">-->
+<!--                AND t.id = #{id}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--    </select>-->
 
 </mapper>

tenant/organization/src/main/resources/mapper/PtlAgreementMapper.xml

@@ -53,7 +53,8 @@
         pa.create_by,pa.create_time,pa.update_by,
         pa.update_time,pa.is_delete,paa.username,paa.user_abbr as userAbber,
         suji.name as managerName,sd.name as managerDeptName,suf.file_name as fileName,suf.file_size as fileSize,
-        eic.name_simple as company,sdd.name as deptName
+        eic.name_simple as company,sdd.name as deptName,
+        pa.api_type
     </sql>
     <select id="queryPage" resultType="com.jzg.commons.entity.vo.AgreementVo">
         select <include refid="Base_Column_List"/>