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-13 14:58:22 +08:00
parent 3b14c9b66a
commit dd69893395
4 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/pack/mapper/xml/PayPackCompanyProjectMapper.xml
+1
View File
@@ -89,6 +89,7 @@
<if test="paymentDate != null and paymentDate != ''">
AND DATE_FORMAT(ppr.payment_date,'%Y') = #{paymentDate}
</if>
WHERE project.id IS NOT NULL AND project.id != ''
GROUP BY ppcp.project_id ORDER BY ppcp.create_time desc
</select>
<select id="queryPackListAll" resultType="com.jero.project.entity.PayCommonProject">
jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
+4 -5
View File
@@ -109,7 +109,7 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
throw new JeroBootException("此项目已在合同处创建关联，请先从合同处取消关联！");
}
// 更新项目状态
projectPackService.updateProjectStatus(payPackCompanyProject.getProjectId(),String.valueOf(payPackCompanyProject.getProjectType()),String.valueOf(PackCommon.PACKAGING0),payPackCompanyProject.getPackId());
projectPackService.updateProjectStatus(payPackCompanyProjectNew.getProjectId(),String.valueOf(payPackCompanyProjectNew.getProjectType()),String.valueOf(PackCommon.PACKAGING0),payPackCompanyProject.getPackId());
payPackCompanyProjectService.removeById(payPackCompanyProject.getId());
}
@@ -121,16 +121,15 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
if(StringUtils.isBlank(s1)){
throw new JeroBootException("id不能为空!");
}
PayPackCompanyProject payPackCompanyProjectNew = payPackCompanyProjectService.getById(payPackCompanyProject.getId());
PayPackCompanyProject payPackCompanyProjectNew = payPackCompanyProjectService.getById(s1);
if(Objects.isNull(payPackCompanyProjectNew)){
throw new JeroBootException("不存在打包项目！");
}
if(Objects.equals(payPackCompanyProjectNew.getCome(),PackCommon.COME2)){
if(Objects.equals(payPackCompanyProjectNew.getCome(),PackCommon.COME1)){
throw new JeroBootException("此项目已在合同处创建关联，请先从合同处取消关联！");
}
// 更新项目状态
projectPackService.updateProjectStatus(s1,String.valueOf(payPackCompanyProjectNew.getProjectType()),String.valueOf(PackCommon.PACKAGING0),payPackCompanyProject.getPackId());
projectPackService.updateProjectStatus(payPackCompanyProjectNew.getProjectId(),String.valueOf(payPackCompanyProjectNew.getProjectType()),String.valueOf(PackCommon.PACKAGING0),payPackCompanyProject.getPackId());
}
payPackCompanyProjectService.removeByIds(Arrays.asList(payPackCompanyProject.getPackProjectIds()));
}