bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:4ca2b3e091bb6d9f208eb7d0b1a683cc1422b077
Branches Tags
bonus:master
bonus:branch_basic
..
compare: bonus:b8cf2f3c2a569d0cba3d70a1f9d2f31e9cf4991c
Branches Tags
bonus:master
bonus:branch_basic

No commits in common. "4ca2b3e091bb6d9f208eb7d0b1a683cc1422b077" and "b8cf2f3c2a569d0cba3d70a1f9d2f31e9cf4991c" have entirely different histories.
4ca2b3e091 ... b8cf2f3c2a

5 changed files with 16 additions and 42 deletions
Show Stats Expand all files Collapse all files

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/PushProDataUseInfoController.java
View File

@ -212,13 +212,8 @@ public class PushProDataUseInfoController extends BaseController {
@GetMapping(value = "getCompletionNotRefundedDetails")
public TableDataInfo getCompletionNotRefundedDetails(ProIdsBean bean) {
try {
List<MachineInfoBean> results = new ArrayList<>();
startPage();
if (bean.getDeptId() != null) {
results = service.getCompletionNotRefundedDetails(bean);
} else {
results = service.getCompletionNotRefundedDetailsSub(bean);
}
List<MachineInfoBean> results = service.getCompletionNotRefundedDetails(bean);
return getDataTable(results);
} catch (Exception e) {
logger.error(e.toString(), e);

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/ProDataUseInfoMapper.java
View File

@ -55,6 +55,4 @@ public interface ProDataUseInfoMapper {
SysUser getPersonNameAndPhone(MachineInfoBean machineDetail);
List<MachineInfoBean> getCompletionNotRefundedSub(ProIdsBean bean);
List<MachineInfoBean> getCompletionNotRefundedDetailsSub(ProIdsBean bean);
}

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/ProDataUseInfoService.java
View File

@ -46,6 +46,4 @@ public interface ProDataUseInfoService {
List<MachineInfoBean> getAllMacheDetails(ProIdsBean bean);
List<MachineInfoBean> getCompletionNotRefundedSub(ProIdsBean bean);
List<MachineInfoBean> getCompletionNotRefundedDetailsSub(ProIdsBean bean);
}

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/service/impl/ProDataUseInfoImpl.java
View File

@ -213,9 +213,4 @@ public class ProDataUseInfoImpl implements ProDataUseInfoService {
public List<MachineInfoBean> getCompletionNotRefundedSub(ProIdsBean bean) {
return proDataUseInfoMapper.getCompletionNotRefundedSub(bean);
}
@Override
public List<MachineInfoBean> getCompletionNotRefundedDetailsSub(ProIdsBean bean) {
return proDataUseInfoMapper.getCompletionNotRefundedDetailsSub(bean);
}
}

42
bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
View File

@ -283,6 +283,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getCompletionNotRefundedDetails" resultType="com.bonus.material.push.domain.MachineInfoBean">
select
bp.pro_name as proName,
bp.pro_center as proCenter,
bp.actual_end_date as actualEndDate,
DATEDIFF(NOW(), bp.actual_end_date) as daysDiff,
sai.num num,
@ -296,8 +297,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_dept sd on bp.imp_unit = sd.dept_id
left join ma_type mt on sai.type_id = mt.type_id
left join ma_type mt2 on mt.parent_id = mt2.type_id
where sai.status = 0 and bp.actual_end_date is not null
and sd.dept_id = #{deptId}
where sai.is_slt = 0 and sai.end_time is null and bp.actual_end_date is not null
and sd.dept_id = #{deptId} and bp.pro_center is not null
<if test="proId != null">
AND bp.pro_id = #{proId}
</if>
<if test="deptName != null and deptName !=''">
AND sd.dept_name like concat ('%', #{deptName}, '%')
</if>
<if test="proCenter != null and proCenter !=''">
AND bp.pro_center like concat ('%', #{proCenter}, '%')
</if>
<if test="proName != null and proName !=''">
AND bp.pro_name like concat ('%', #{proName}, '%')
</if>
<if test="typeName != null and typeName !=''">
AND mt2.type_name like concat ('%', #{typeName}, '%')
</if>
@ -642,30 +655,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where sai.is_slt = 0 and sai.end_time is null and bp.actual_end_date is not null AND sd.dept_name = #{deptName} and bp.pro_center is not null
GROUP BY bp.pro_center
</select>
<select id="getCompletionNotRefundedDetailsSub" resultType="com.bonus.material.push.domain.MachineInfoBean">
select
bp.pro_name as proName,
bp.pro_center as proCenter,
bp.actual_end_date as actualEndDate,
DATEDIFF(NOW(), bp.actual_end_date) as daysDiff,
sai.num num,
mt.type_name as typeModelName,
mt.unit_name as unit,
mt2.type_name as typeName
from slt_agreement_info sai
left join bm_agreement_info bai on sai.agreement_id = bai.agreement_id
left join bm_project bp on bai.project_id = bp.pro_id
left join sys_dept sd on bp.imp_unit = sd.dept_id
left join ma_type mt on sai.type_id = mt.type_id
left join ma_type mt2 on mt.parent_id = mt2.type_id
where sai.status = 0 and bp.actual_end_date is not null
and bp.pro_center is not null and bp.pro_center= #{proCenter}
<if test="typeName != null and typeName !=''">
AND mt2.type_name like concat ('%', #{typeName}, '%')
</if>
<if test="typeModelName != null and typeModelName !=''">
AND mt.type_name like concat ('%', #{typeModelName}, '%')
</if>
</select>
</mapper>