wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'version_report' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_report

Browse Source
This commit is contained in:
wulin 2020-09-27 17:41:31 +08:00
commit 9cd27c4622
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/modules/sys/dao/app/ResultRecordMapper.java
View File

@ -40,6 +40,8 @@ public interface ResultRecordMapper extends BaseMapper<ResultRecord> {
int deleteResultRecordById(@Param("id") Long id);
int deleteResultRecordById2(@Param("id") Long id);
List<ResultRecord> selectByCondition(@Param("page") IPage page, @Param("req") ResultRecordReq req);

1
src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
View File

@ -45,6 +45,7 @@ public interface ResultRecordService extends IService<ResultRecord> {
int deleteResultRecordById(Long id);
int deleteResultRecordById2(Long id);
R queryPage(ResultRecordReq params, SysUserEntity user);

7
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -150,6 +150,11 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
return resultRecordMapper.deleteResultRecordById(id);
}
@Override
public int deleteResultRecordById2(Long id) {
return resultRecordMapper.deleteResultRecordById2(id);
}
@Override
public R queryPage(ResultRecordReq params, SysUserEntity user) {
List<String> departmentIds = new ArrayList<>();
@ -353,7 +358,7 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
resultRecordOld.setFlowStaffIdRole(resultDetailService.initRole(resultRecordOld.getStaffId(), roleId));
resultRecordService.insertResultRecord(resultRecordOld);
//删除月初目标
resultRecordService.deleteResultRecordById(oldResultRecordId);
resultRecordService.deleteResultRecordById2(oldResultRecordId);
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByResultRecordIdFlowId(oldResultRecordId);
for(FlowRecord flowRecord : flowRecords){
flowRecord.setRecordId(resultRecordOld.getId());

6
src/main/resources/mapper/app/ResultRecordMapper.xml
View File

@ -135,6 +135,12 @@
</update>
<update id="deleteResultRecordById2" parameterType="java.lang.Long">
update lz_result_record set is_delete = 2 where id=#{id} limit 1
</update>
<select id="selectByCondition" resultType="com.lz.modules.sys.entity.app.ResultRecord">