Browse Source

debug

contract
Yen 2 years ago
parent
commit
e795bf6bc6
  1. 3
      src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
  2. 3
      src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
  3. 3
      src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java
  4. 10
      src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java
  5. 4
      src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java
  6. 3
      src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

3
src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@ -82,6 +82,9 @@ public class SysUserController {
}
R<String> rs = service.getBase(TbsSeeYonConst.OA_USER_INFO+"?code="+code,null);
String listJson = rs.getMsg();
if(listJson.equals("null")){
return R.error("无相关工号的员工信息:"+code);
}
return R.ok(JSONUtil.parse(listJson));
}

3
src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@ -358,6 +358,7 @@ public class TbsCostApplyController {
* 提交审批节点
* @return
*/
@LimitSubmit
@PostMapping("/commitAffair")
@SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE)
@PreAuthorize("hasRole('tbs:costApply:commit')")
@ -370,6 +371,7 @@ public class TbsCostApplyController {
* @param id
* @return
*/
@LimitSubmit
@PostMapping("/compensate/{id}")
@SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.UPDATE)
public R<?> compensate(@PathVariable("id") String id){
@ -381,6 +383,7 @@ public class TbsCostApplyController {
* @param param
* @return
*/
@LimitSubmit
@PostMapping("/addNode")
@SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE)
public R<String> addNode(@RequestBody CtpAddNodeParam param){

3
src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java

@ -128,7 +128,8 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
int max = 0;
for (TbsActivity tbsActivity : activityList) {
try {
String tml = tbsActivity.getActivityCode().split("_")[1];
String[] tmls = tbsActivity.getActivityCode().split("_");
String tml = tmls.length>1?tmls[1]:"0";
Integer i = Integer.parseInt(tml);
if(i>max){
max = i;

10
src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java

@ -416,6 +416,16 @@ public class TzcPolicyController {
return tzcPolicyOperationService.getUnfinished();
}
/**
* 补偿按钮
* @param id
* @return
*/
@PostMapping("/compensate/{id}")
public R<?> compensate(@PathVariable("id") String id){
//return vtbVerificationOperationService.runCompensate(id);
return R.ok();
}
}

4
src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java

@ -89,7 +89,8 @@ public class TzcPolicyItemServiceImpl extends ServiceImpl<TzcPolicyItemMapper,Tz
int max = 0;
for (TzcPolicyItem policyItem : policyItemList) {
try {
String tml = policyItem.getPolicyItemCode().split("_")[1];
String[] tmls = policyItem.getPolicyItemCode().split("_");
String tml = tmls.length>1?tmls[1]:"0";
Integer i = Integer.parseInt(tml);
if(i>max){
max = i;
@ -126,6 +127,7 @@ public class TzcPolicyItemServiceImpl extends ServiceImpl<TzcPolicyItemMapper,Tz
tzcPolicyItem.setAttachIds(param.getAttachIds());
tzcPolicyItem.setPreActQuantity(param.getPreActQuantity());
tzcPolicyItem.setPreNotActQuantity(param.getPreNotActQuantity());
tzcPolicyItem.setRemark(param.getRemark());
//移除旧记录
if(param.getId()!=null){
LambdaQueryWrapper<TzcPolicyGoods> lqw = new LambdaQueryWrapper<>();

3
src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java

@ -282,6 +282,7 @@ public class VtbVerificationController {
* 提交审批节点
* @return
*/
@LimitSubmit
@PostMapping("/commitAffair")
@SysLog(module = SystemModule.Budget, title = "费用申请", biz = BizType.DELETE)
@PreAuthorize("hasRole('tbs:costApply:commit')")
@ -295,6 +296,7 @@ public class VtbVerificationController {
* @param param
* @return
*/
@LimitSubmit
@PostMapping("/addNode")
@SysLog(module = SystemModule.Verification, title = "核销加签", biz = BizType.OTHER)
public R<String> addNode(@RequestBody CtpAddNodeParam param){
@ -315,6 +317,7 @@ public class VtbVerificationController {
* @param id
* @return
*/
@LimitSubmit
@PostMapping("/compensate/{id}")
public R<?> compensate(@PathVariable("id") String id){
return vtbVerificationOperationService.runCompensate(id);

Loading…
Cancel
Save