Browse Source

修复出库申请分页列表字段

master
dimengzhe 3 years ago
parent
commit
325248220b
  1. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
  2. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
  3. 14
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
  4. 1
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@ -109,7 +109,7 @@ public interface BusDeliveredApplyFeign {
* @return
*/
@ApiOperation("编辑初始化/详情")
@GetMapping("/fetchDetailsBySid")
@PostMapping("/fetchDetailsBySid")
@ResponseBody
public ResultBean<BusDeliveredApplyDetailVo> fetchDetailsBySid(@RequestBody BusDeliveredApplyDetailQuery query);

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@ -16,6 +16,10 @@
when 1 then '已交款'
when 2 then '未交款' end as type,
bd.modelName,
bd.price,
bd.mobile,
bd.idNo,
bd.address,
bd.price
FROM bus_delivered bd
${ew.customSqlSegment}

14
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@ -4,17 +4,17 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo">
SELECT sid,
case state
SELECT bd.sid,
case bd.state
when 1 then '待提交'
when 2 then '待审核'
when 3 then '已通过'
when 4 then '未通过' end as state,
contractNo,
name,
DATE_FORMAT(applyDate, '%Y-%m-%d') as applyDate,
applyName
FROM bus_delivered_apply
bd.contractNo,
bd.name,
DATE_FORMAT(bd.applyDate, '%Y-%m-%d') as applyDate,
bd.applyName
FROM bus_delivered_apply bd
<where>
${ew.sqlSegment}
</where>

1
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java

@ -172,6 +172,7 @@ public class SysStaffOrgService extends MybatisBaseService<SysStaffOrgMapper, Sy
if (sysOrganization != null) {
if (sysOrganization.getIsDept() == 0 && !"0".equals(sysOrganization.getPsid())) {
sid = list.get(i);
break;
}
}
}

Loading…
Cancel
Save