Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe0036 3 months ago
parent
commit
10d3368360
  1. 22
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue
  2. 22
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue
  3. 22
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementAdd.vue
  4. 21
      yxt-as-ui/src/views/operation/workorderinvoicing/relation/chooseRepairbill.vue
  5. 3
      yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue
  6. 21
      yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/relation/chooseRepairbill.vue
  7. 3
      yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue
  8. 4
      yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListQuery.java
  9. 5
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
  10. 160
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapply/AsBwinvoiceapplyRest.java
  11. 1076
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapply/AsBwinvoiceapplyService.java
  12. 3
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailMapper.java
  13. 4
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailService.java
  14. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdNoexpatriatesHostelApplyRest.java
  15. 6
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApply.java
  16. 5
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyDetailVo.java
  17. 5
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyDto.java
  18. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyMapper.xml
  19. 5
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyVo.java
  20. 3
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyDto.java
  21. 15
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyMapper.xml
  22. 7
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyService.java
  23. 16
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetail.java
  24. 10
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailDto.java
  25. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailMapper.xml
  26. 6
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailService.java
  27. 10
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailVo.java
  28. 9
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelListDetailVo.java

22
anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue

@ -50,7 +50,7 @@
<span v-if="formobj.calculationModeValue == '比例'">(%)</span>
<span v-else>()</span>
</div>
<el-form-item prop="calculationStandard"><el-input class="addinputInfo addinputw" v-model="formobj.calculationStandard" @keyup.native="formobj.calculationStandard = getNumber(formobj.calculationStandard, 2)" clearable placeholder="" /></el-form-item>
<el-form-item prop="calculationStandard"><el-input class="addinputInfo addinputw" v-model="formobj.calculationStandard" @keyup.native="formobj.calculationStandard = getSpecialNumber(formobj.calculationStandard, 2)" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
@ -158,6 +158,26 @@ export default {
}
})
},
getSpecialNumber(val, limit) {
val = val.replace(/[^0-9.-]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace(/\-{2,}/g, '.') // -
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') //
val = val.replace('-', '$#$').replace(/\-/g, '').replace('$#$', '-'); // "-"
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
val = val.replace(/^00/, '0.') // 0

22
anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue

@ -49,7 +49,7 @@
<span v-if="formobj.calculationModeValue == '比例'">(%)</span>
<span v-else>()</span>
</div>
<el-form-item prop="calculationStandard"><el-input class="addinputInfo addinputw" v-model="formobj.calculationStandard" @keyup.native="formobj.calculationStandard = getNumber(formobj.calculationStandard, 2)" clearable placeholder="" /></el-form-item>
<el-form-item prop="calculationStandard"><el-input class="addinputInfo addinputw" v-model="formobj.calculationStandard" @keyup.native="formobj.calculationStandard = getSpecialNumber(formobj.calculationStandard, 2)" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<div class="title">车辆信息({{ formobj.vinNo }} {{ formobj.purchaseSystemName }} {{ formobj.brandName }})</div>
@ -175,6 +175,26 @@ export default {
}
})
},
getSpecialNumber(val, limit) {
val = val.replace(/[^0-9.-]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace(/\-{2,}/g, '.') // -
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') //
val = val.replace('-', '$#$').replace(/\-/g, '').replace('$#$', '-'); // "-"
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
val = val.replace(/^00/, '0.') // 0

22
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagementAdd.vue

@ -64,7 +64,7 @@
<el-row>
<el-col :span="24">
<div class="span-sty"><span class="icon">*</span>预计返利</div>
<el-form-item prop="estimateRebate"><el-input class="addinputInfo" style="width: 30%" v-model="formobj.estimateRebate" @keydown.native="formobj.estimateRebate = getNumber(formobj.estimateRebate, 1)" placeholder="" clearable /></el-form-item>
<el-form-item prop="estimateRebate"><el-input class="addinputInfo" style="width: 30%" v-model="formobj.estimateRebate" @keydown.native="formobj.estimateRebate = getSpecialNumber(formobj.estimateRebate, 2)" placeholder="" clearable /></el-form-item>
</el-col>
</el-row>
<el-row>
@ -151,6 +151,26 @@ export default {
}
},
methods: {
getSpecialNumber(val, limit) {
val = val.replace(/[^0-9.-]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace(/\-{2,}/g, '.') // -
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.') //
val = val.replace('-', '$#$').replace(/\-/g, '').replace('$#$', '-'); // "-"
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
val = val.replace(/^00/, '0.') // 0

21
yxt-as-ui/src/views/operation/workorderinvoicing/relation/chooseRepairbill.vue

@ -101,7 +101,8 @@ export default {
vinNo: '',
settleTimeStart: '',
settleTimeEnd: '',
deptSid: ''
deptSid: '',
sids: []
},
total: 0
}
@ -159,15 +160,15 @@ export default {
this.sids = row
},
showData(value, deptSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
const aa = []
if (value.length > 0) {
for (var i = 0; i < value.length; i++) {
aa.push(value[i].sourceBillSid)
}
this.listQuery.params.sids = aa
} else {
this.listQuery.params.sids = []
}``
this.listQuery.params.deptSid = deptSid
this.listQuery.current = 1
this.listQuery.size = 5

3
yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue

@ -240,8 +240,7 @@ export default {
},
chooseGd() {
this.viewState = 2
const aa = []
this.$refs['divGD'].showData(aa, this.formobj.deptSid)
this.$refs['divGD'].showData(this.formobj.asBwinvoiceapplyDetailList, this.formobj.deptSid)
},
handleDelete(index) {
this.formobj.asBwinvoiceapplyDetailList.splice(index, 1)

21
yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/relation/chooseRepairbill.vue

@ -101,7 +101,8 @@ export default {
vinNo: '',
settleTimeStart: '',
settleTimeEnd: '',
deptSid: ''
deptSid: '',
sids: []
},
total: 0
}
@ -159,15 +160,15 @@ export default {
this.sids = row
},
showData(value, deptSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
const aa = []
if (value.length > 0) {
for (var i = 0; i < value.length; i++) {
aa.push(value[i].sourceBillSid)
}
this.listQuery.params.sids = aa
} else {
this.listQuery.params.sids = []
}
this.listQuery.params.deptSid = deptSid
this.listQuery.current = 1
this.listQuery.size = 5

3
yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue

@ -234,8 +234,7 @@ export default {
},
chooseGd() {
this.viewState = 2
const aa = []
this.$refs['divGD'].showData(aa, this.formobj.deptSid)
this.$refs['divGD'].showData(this.formobj.asBwinvoiceapplyDetailList, this.formobj.deptSid)
},
handleDelete(index) {
this.formobj.asBwinvoiceapplyDetailList.splice(index, 1)

4
yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBwBillPageListQuery.java

@ -4,6 +4,8 @@ import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: dimengzhe
@ -25,4 +27,6 @@ public class AsBusrepairBwBillPageListQuery implements Query {
@ApiModelProperty("结算日期")
private String settleTimeStart;
private String settleTimeEnd;
private List<String> sids;
}

5
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@ -1656,6 +1656,11 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
String deptSid = query.getDeptSid();
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData();
if (query.getSids() != null) {
if (query.getSids().size() > 0) {
qw.notIn("a.sid", query.getSids());
}
}
//维修工单编号
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("a.billNo", query.getBillNo());

160
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapply/AsBwinvoiceapplyRest.java

@ -48,88 +48,86 @@ import java.util.List;
@RequestMapping("v1/asbwinvoiceapply")
public class AsBwinvoiceapplyRest {
@Autowired
private AsBwinvoiceapplyService asBwinvoiceapplyService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<AsBwinvoiceapplyVo>> listPage(@RequestBody PagerQuery<AsBwinvoiceapplyQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<AsBwinvoiceapplyVo> pv = asBwinvoiceapplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody AsBwinvoiceapplyDto dto){
ResultBean rb = ResultBean.fireFail();
asBwinvoiceapplyService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("根据sid批量删除")
@Autowired
private AsBwinvoiceapplyService asBwinvoiceapplyService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<AsBwinvoiceapplyVo>> listPage(@RequestBody PagerQuery<AsBwinvoiceapplyQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<AsBwinvoiceapplyVo> pv = asBwinvoiceapplyService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody AsBwinvoiceapplyDto dto) {
return asBwinvoiceapplyService.saveOrUpdateDto(dto);
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
return asBwinvoiceapplyService.delAll(sids);
}
public ResultBean delBySids(@RequestBody String[] sids) {
return asBwinvoiceapplyService.delAll(sids);
}
@ApiOperation("根据SID获取一条记录")
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<AsBwinvoiceapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
AsBwinvoiceapplyDetailsVo vo = asBwinvoiceapplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@ApiOperation("提交")
@PostMapping("/submitApply")
public ResultBean submitApply(@Valid @RequestBody SubmitBwinvoiceApplyDto dto) {
return asBwinvoiceapplyService.submitApply(dto);
}
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody CompleteBwinvoiceApplyDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId("");
return asBwinvoiceapplyService.complete(bv);
}
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject")
ResultBean<List<BwinvoiceApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap BwinvoiceApplyNodeQuery query) {
return asBwinvoiceapplyService.getPreviousNodesForReject(query);
}
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
ResultBean<List<BwinvoiceApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap BwinvoiceApplyNodeQuery query) {
return asBwinvoiceapplyService.getNextNodesForSubmit(query);
}
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")
public ResultBean taskReject(@Valid @RequestBody BwinvoiceApplyTaskQuery query) {
return asBwinvoiceapplyService.taskReject(query);
}
@ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@Valid @RequestBody BwinvoiceApplyTaskQuery query) {
return asBwinvoiceapplyService.revokeProcess(query);
}
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@Valid @RequestBody BwinvoiceApplyTaskQuery query) {
return asBwinvoiceapplyService.breakProcess(query);
}
@ApiOperation(value = "加签")
@PostMapping(value = "/delegate")
@ResponseBody
public ResultBean delegate(@RequestBody BwinvoiceApplyDelegateQuery query) {
return asBwinvoiceapplyService.delegate(query);
}
public ResultBean<AsBwinvoiceapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail();
AsBwinvoiceapplyDetailsVo vo = asBwinvoiceapplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@ApiOperation("提交")
@PostMapping("/submitApply")
public ResultBean submitApply(@Valid @RequestBody SubmitBwinvoiceApplyDto dto) {
return asBwinvoiceapplyService.submitApply(dto);
}
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody CompleteBwinvoiceApplyDto query) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId("");
return asBwinvoiceapplyService.complete(bv);
}
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject")
ResultBean<List<BwinvoiceApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap BwinvoiceApplyNodeQuery query) {
return asBwinvoiceapplyService.getPreviousNodesForReject(query);
}
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
ResultBean<List<BwinvoiceApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap BwinvoiceApplyNodeQuery query) {
return asBwinvoiceapplyService.getNextNodesForSubmit(query);
}
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")
public ResultBean taskReject(@Valid @RequestBody BwinvoiceApplyTaskQuery query) {
return asBwinvoiceapplyService.taskReject(query);
}
@ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@Valid @RequestBody BwinvoiceApplyTaskQuery query) {
return asBwinvoiceapplyService.revokeProcess(query);
}
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@Valid @RequestBody BwinvoiceApplyTaskQuery query) {
return asBwinvoiceapplyService.breakProcess(query);
}
@ApiOperation(value = "加签")
@PostMapping(value = "/delegate")
@ResponseBody
public ResultBean delegate(@RequestBody BwinvoiceApplyDelegateQuery query) {
return asBwinvoiceapplyService.delegate(query);
}
}

1076
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapply/AsBwinvoiceapplyService.java

File diff suppressed because it is too large

3
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailMapper.java

@ -59,4 +59,7 @@ public interface AsBwinvoiceapplyDetailMapper extends BaseMapper<AsBwinvoiceappl
@Select("select * from as_bwinvoiceapply_detail where mainSid = #{mainSid}")
List<AsBwinvoiceapplyDetailDetailsVo> fetchByMainSid(String mainSid);
@Select("select count(*) from as_bwinvoiceapply_detail where sourceBillSid = #{sourceBillSid}")
int selBySourceBillSid(String sourceBillSid);
}

4
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapplydetail/AsBwinvoiceapplyDetailService.java

@ -92,4 +92,8 @@ public class AsBwinvoiceapplyDetailService extends MybatisBaseService<AsBwinvoic
public List<AsBwinvoiceapplyDetailDetailsVo> fetchByMainSid(String mainSid) {
return baseMapper.fetchByMainSid(mainSid);
}
public int selBySourceBillSid(String sourceBillSid) {
return baseMapper.selBySourceBillSid(sourceBillSid);
}
}

1
yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdNoexpatriatesHostelApplyRest.java

@ -95,6 +95,7 @@ public class AdNoexpatriatesHostelApplyRest {
public ResultBean reject(@Valid @RequestBody TaskDto dto) {
return adNoexpatriatesHostelApplyService.reject(dto);
}
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody

6
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApply.java

@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ApiModel(value = "驻外人员探亲申请", description = "驻外人员探亲申请")
@TableName("ad_expatriates_home_apply")
@ -61,6 +63,10 @@ public class AdExpatriatesHomeApply extends BaseEntity {
@ApiModelProperty("探亲类型")
private String homeTypeKey;
private String homeTypeValue;
@ApiModelProperty("预计费用")
private BigDecimal expectCost;
@ApiModelProperty("费用明细")
private String costRemarks;
@ApiModelProperty("基础表单sid")
private String formSid; // 基础表单sid
@ApiModelProperty("关联审批sid列表,英文逗号分隔")

5
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyDetailVo.java

@ -30,6 +30,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@ -57,6 +58,10 @@ public class AdExpatriatesHomeApplyDetailVo implements Vo {
private String peoNum;
@ApiModelProperty("探亲类型")
private String homeTypeValue;
@ApiModelProperty("预计费用")
private BigDecimal expectCost;
@ApiModelProperty("费用明细")
private String costRemarks;
@ApiModelProperty("备注")
private String remarks;

5
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyDto.java

@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@ -65,6 +66,10 @@ public class AdExpatriatesHomeApplyDto extends OaFormDto {
private FormCommon homeTypeObj;
private String homeTypeKey;
private String homeTypeValue;
@ApiModelProperty("预计费用")
private BigDecimal expectCost;
@ApiModelProperty("费用明细")
private String costRemarks;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("基础表单sid")

4
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyMapper.xml

@ -23,7 +23,9 @@
thisEndDate,
relationValue,
peoNum,
homeTypeValue
homeTypeValue,
expectCost,
costRemarks
from ad_expatriates_home_apply
where sid = #{sid}
</select>

5
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adexpatriateshomeapply/AdExpatriatesHomeApplyVo.java

@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@ -71,6 +72,10 @@ public class AdExpatriatesHomeApplyVo implements Vo {
private FormCommon homeTypeObj;
private String homeTypeKey;
private String homeTypeValue;
@ApiModelProperty("预计费用")
private BigDecimal expectCost;
@ApiModelProperty("费用明细")
private String costRemarks;
@ApiModelProperty("备注")
private String remarks;

3
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyDto.java

@ -27,6 +27,7 @@ package com.yxt.anrui.oa.biz.adnoexpatriateshostelapply;
import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailDto;
import com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailDto;
import com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailVo;
import com.yxt.anrui.oa.biz.oaform.FormCommon;
import com.yxt.anrui.oa.biz.oaform.OaFormDto;
@ -68,5 +69,5 @@ public class AdNoexpatriatesHostelApplyDto extends OaFormDto {
@ApiModelProperty("文件")
private List<String> appes = new ArrayList<>();
private List<AdNoexpatriatesHostelDetailVo> list = new ArrayList<>();
private List<AdNoexpatriatesHostelDetailDto> list = new ArrayList<>();
}

15
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyMapper.xml

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.oa.biz.adnoexpatriateshostelapply.AdNoexpatriatesHostelApplyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="details"
resultType="com.yxt.anrui.oa.biz.adnoexpatriateshostelapply.AdNoexpatriatesHostelApplyDetailsVo">
@ -12,15 +12,20 @@
where sid = #{sid}
</select>
<resultMap id="detailMap" type="com.yxt.anrui.oa.biz.adnoexpatriateshostelapply.AdNoexpatriatesHostelApplyDetailsVo">
<resultMap id="detailMap"
type="com.yxt.anrui.oa.biz.adnoexpatriateshostelapply.AdNoexpatriatesHostelApplyDetailsVo">
<result column="remarks" property="remarks"/>
<collection property="list" ofType="com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelListDetailVo"
<collection property="list"
ofType="com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelListDetailVo"
select="selectList" column="sid">
</collection>
</resultMap>
<select id="selectList" resultType="com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelListDetailVo">
<select id="selectList"
resultType="com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelListDetailVo">
select sid,
userName userValue,
deptName deptValue,
postName jobValue,
remarks
from ad_noexpatriates_hostel_detail

7
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshostelapply/AdNoexpatriatesHostelApplyService.java

@ -27,6 +27,7 @@ package com.yxt.anrui.oa.biz.adnoexpatriateshostelapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailVo;
import com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailDto;
import com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailService;
import com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailVo;
import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
@ -89,6 +90,10 @@ public class AdNoexpatriatesHostelApplyService extends MybatisBaseService<AdNoex
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
list.stream().forEach(details -> {
FormCommon userObj = FormCommon.of(details.getUserKey(), details.getUserValue());
details.setUserObj(userObj);
FormCommon deptObj = FormCommon.of(details.getDeptKey(), details.getDeptValue());
details.setDeptObj(deptObj);
FormCommon jobObj = FormCommon.of(details.getJobKey(), details.getJobValue());
details.setJobObj(jobObj);
});
@ -106,7 +111,7 @@ public class AdNoexpatriatesHostelApplyService extends MybatisBaseService<AdNoex
String sid = dto.getSid();
List<String> files = dto.getFiles();
List<String> appes = dto.getAppes();
List<AdNoexpatriatesHostelDetailVo> list = dto.getList();
List<AdNoexpatriatesHostelDetailDto> list = dto.getList();
if (StringUtils.isBlank(sid)) {
// 新建操作
AdNoexpatriatesHostelApply entity = new AdNoexpatriatesHostelApply();

16
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetail.java

@ -38,9 +38,17 @@ public class AdNoexpatriatesHostelDetail extends BaseEntity {
@ApiModelProperty("申请sid")
private String mainSid;
@ApiModelProperty("申请人岗位sid")
private String postSid; // 申请人岗位sid
@ApiModelProperty("申请人岗位名称")
private String postName; // 申请人岗位名称
@ApiModelProperty("人员sid")
private String userSid;
@ApiModelProperty("人员姓名")
private String userName;
@ApiModelProperty("部门sid")
private String deptSid;
@ApiModelProperty("部门名称")
private String deptName;
@ApiModelProperty("岗位sid")
private String postSid;
@ApiModelProperty("岗位名称")
private String postName;
}

10
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailDto.java

@ -38,7 +38,15 @@ public class AdNoexpatriatesHostelDetailDto implements Dto {
@ApiModelProperty("申请事由及详情")
private String remarks;
@ApiModelProperty("申请人职位")
@ApiModelProperty("人员")
private FormCommon userObj;
private String userKey;
private String userValue;
@ApiModelProperty("部门")
private FormCommon deptObj;
private String deptKey;
private String deptValue;
@ApiModelProperty("岗位")
private FormCommon jobObj;
private String jobKey;
private String jobValue;

4
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailMapper.xml

@ -7,6 +7,10 @@
<select id="getUpdateInit"
resultType="com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail.AdNoexpatriatesHostelDetailVo">
select sid,
userSid userKey,
userName userValue,
deptSid deptKey,
deptName deptValue,
postSid jobKey,
postName jobValue,
remarks

6
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailService.java

@ -40,7 +40,7 @@ public class AdNoexpatriatesHostelDetailService extends MybatisBaseService<AdNoe
return baseMapper.getUpdateInit(sid);
}
public void saveDetails(List<AdNoexpatriatesHostelDetailVo> list, String sid) {
public void saveDetails(List<AdNoexpatriatesHostelDetailDto> list, String sid) {
//根据sid查询明细并删除
List<AdNoexpatriatesHostelDetail> list2 = baseMapper.selectByMainSid(sid);
list2.removeAll(Collections.singleton(null));
@ -54,6 +54,10 @@ public class AdNoexpatriatesHostelDetailService extends MybatisBaseService<AdNoe
list.stream().forEach(details -> {
AdNoexpatriatesHostelDetail adNoexpatriatesHostelDetail = new AdNoexpatriatesHostelDetail();
BeanUtil.copyProperties(details, adNoexpatriatesHostelDetail);
adNoexpatriatesHostelDetail.setUserSid(details.getUserKey());
adNoexpatriatesHostelDetail.setUserName(details.getUserValue());
adNoexpatriatesHostelDetail.setDeptSid(details.getDeptKey());
adNoexpatriatesHostelDetail.setDeptName(details.getDeptValue());
adNoexpatriatesHostelDetail.setPostSid(details.getJobKey());
adNoexpatriatesHostelDetail.setPostName(details.getJobValue());
adNoexpatriatesHostelDetail.setMainSid(sid);

10
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelDetailVo.java

@ -40,7 +40,15 @@ public class AdNoexpatriatesHostelDetailVo implements Vo {
@ApiModelProperty("申请事由及详情")
private String remarks;
@ApiModelProperty("申请人职位")
@ApiModelProperty("人员")
private FormCommon userObj;
private String userKey;
private String userValue;
@ApiModelProperty("部门")
private FormCommon deptObj;
private String deptKey;
private String deptValue;
@ApiModelProperty("岗位")
private FormCommon jobObj;
private String jobKey;
private String jobValue;

9
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adnoexpatriateshosteldetail/AdNoexpatriatesHostelListDetailVo.java

@ -25,6 +25,7 @@
*********************************************************/
package com.yxt.anrui.oa.biz.adnoexpatriateshosteldetail;
import com.yxt.anrui.oa.biz.oaform.FormCommon;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -36,6 +37,10 @@ public class AdNoexpatriatesHostelListDetailVo implements Vo {
@ApiModelProperty("申请事由及详情")
private String remarks;
@ApiModelProperty("申请人岗位")
private String JobValue;
@ApiModelProperty("人员")
private String userValue;
@ApiModelProperty("部门")
private String deptValue;
@ApiModelProperty("岗位")
private String jobValue;
}

Loading…
Cancel
Save