LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

企业端，个人信息修改

Browse Source
This commit is contained in:
梁琦涛
2021-09-29 14:22:25 +08:00
parent 18c1f45e29
commit 04a7b48223
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java
+2 -2
View File
@@ -81,7 +81,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
* @param req * @param req
* @return * @return
*/ */
@CompanyNameTranslate(fieldId = "id") // @CompanyNameTranslate(fieldId = "id")
@RequiresPermissions("company:search") @RequiresPermissions("company:search")
@ApiOperation(value="企业管理-分页列表查询", notes="企业管理-分页列表查询") @ApiOperation(value="企业管理-分页列表查询", notes="企业管理-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
@@ -325,7 +325,7 @@ public class PayCompanyManagementController extends JeroController<PayCompanyMan
if(Objects.isNull(payCompanyManagementOld)){ if(Objects.isNull(payCompanyManagementOld)){
return Result.error("企业不存在!"); return Result.error("企业不存在!");
} }
if(Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){ if(!Objects.equals(payCompanyManagementOld.getCompanyName(),payCompanyManagement.getCompanyName())){
return Result.error("企业名称不可修改!"); return Result.error("企业名称不可修改!");
} }
payCompanyManagement.setStatus(payCompanyManagementOld.getStatus()); payCompanyManagement.setStatus(payCompanyManagementOld.getStatus());
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+2 -2
View File
@@ -329,10 +329,10 @@ public class PayContactsManagementController extends JeroController<PayContactsM
if(Objects.isNull(payContactsManagementOld)){ if(Objects.isNull(payContactsManagementOld)){
return Result.error("联系人不存在！"); return Result.error("联系人不存在！");
} }
if(Objects.equals(payContactsManagementOld.getName(),payContactsManagement.getName())){ if(!Objects.equals(payContactsManagementOld.getName(),payContactsManagement.getName())){
return Result.error("姓名不可修改！"); return Result.error("姓名不可修改！");
} }
if(Objects.equals(payContactsManagementOld.getPhone(),payContactsManagement.getPhone())){ if(!Objects.equals(payContactsManagementOld.getPhone(),payContactsManagement.getPhone())){
return Result.error("手机号不可修改！"); return Result.error("手机号不可修改！");
} }
try { try {
jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml
+2 -1
View File
@@ -33,6 +33,7 @@
pic.pack, pic.pack,
pic.pack_year AS packYear, pic.pack_year AS packYear,
pic.status, pic.status,
if(pic.status == 2,1,0) as statusOrder,
pic.create_by AS createBy, pic.create_by AS createBy,
pic.create_time AS createTime, pic.create_time AS createTime,
pic.update_by AS updateBy, pic.update_by AS updateBy,
@@ -90,7 +91,7 @@
AND aa.associatedProject LIKE CONCAT('%',CONCAT(#{projectName},'%')) AND aa.associatedProject LIKE CONCAT('%',CONCAT(#{projectName},'%'))
</if> </if>
</where> </where>
ORDER BY aa.chargeStatus desc,aa.createTime desc ORDER BY aa.chargeStatus desc,aa.statusOrder desc, aa.createTime desc
</select> </select>
<select id="getAssociated" resultType="com.jero.contract.vo.ProjectOutput"> <select id="getAssociated" resultType="com.jero.contract.vo.ProjectOutput">
SELECT * FROM ( SELECT * FROM (
jero-boot-single-startup/src/main/resources/application-dev.yml
+4 -4
View File
@@ -44,9 +44,9 @@ spring:
job-store-type: jdbc job-store-type: jdbc
initialize-schema: embedded initialize-schema: embedded
#设置自动启动，默认为 true #设置自动启动，默认为 true
auto-startup: true auto-startup: false
#启动时更新己存在的Job #启动时更新己存在的Job
overwrite-existing-jobs: true overwrite-existing-jobs: false
properties: properties:
org: org:
quartz: quartz:
@@ -148,7 +148,7 @@ spring:
redis: redis:
database: 14 database: 14
# host: 121.36.69.172 # host: 121.36.69.172
host: 192.168.18.254 host: localhost
lettuce: lettuce:
pool: pool:
max-active: 8 #最大连接数据库连接数,设 0 为没有限制 max-active: 8 #最大连接数据库连接数,设 0 为没有限制
@@ -157,7 +157,7 @@ spring:
min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制
shutdown-timeout: 100ms shutdown-timeout: 100ms
# password: hzwlsoft.com # password: hzwlsoft.com
password: 123456 password:
# port: 4780 # port: 4780
port: 6379 port: 6379