WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT

Browse Source
This commit is contained in:
高嵩
2023-10-20 13:50:49 +08:00
parent 55a561a233 7788adc21d
commit d6103d5ce2
9 changed files with 160 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
+1
View File
@@ -216,5 +216,6 @@ public class LawsMonthlyReportWriteEO implements Serializable {
private String sourceCn;//来源中文
private String sourceEn;//来源英文
private String time;//日期
private String saveState;//保存状态
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/SaveStateEnum.java
+40
View File
@@ -0,0 +1,40 @@
package com.jero.modules.report.enums;
/**
* @description
* @date 2022/1/21 15:22
* @auth zhn
*/
public enum SaveStateEnum {
SAVE("保存","0"),
SUBMIT("提交","1")
;
String name;
String value;
private SaveStateEnum(String name, String value) {
this.name = name;
this.value = value;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+25 -1
View File
@@ -24,6 +24,7 @@ import com.jero.modules.report.entity.NewOpinionTemplateEO;
import com.jero.modules.report.entity.NewStandardTemplateEO;
import com.jero.modules.report.enums.ContentTemplateEnum;
import com.jero.modules.report.enums.ExportStateEnum;
import com.jero.modules.report.enums.SaveStateEnum;
import com.jero.modules.report.mapper.LawsMonthlyReportWriteEOMapper;
import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService;
import com.jero.modules.report.service.ILawsMonthlyReportWriteEOService;
@@ -32,7 +33,6 @@ import com.jero.modules.report.service.INewStandardTemplateEOService;
import com.jero.modules.report.util.WordUtil;
import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.enums.ProjectRoleEnum;
import com.jero.modules.system.service.impl.SysBaseApiImpl;
import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
@@ -105,6 +105,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
*/
@Override
public void add(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) {
// lawsMonthlyReportWriteEO.setSaveState("0");
// lawsMonthlyReportWriteEO.setMemoriesChapterOne("2");
Date now = new Date();
lawsMonthlyReportWriteEO.setCreateTime(now);
@@ -138,6 +139,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
*/
@Override
public void editById(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) {
// lawsMonthlyReportWriteEO.setSaveState("1");
Date now = new Date();
lawsMonthlyReportWriteEO.setUpdateTime(now);
saveOrUpdate(lawsMonthlyReportWriteEO);
@@ -304,6 +306,17 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
// queryWrapper.in("create_by",currentUser.getUsername());
// }
//-------------------------------------------------------------------------------------
//草稿只能自己查看，已提交的所有人都可以查看
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
queryWrapper.lambda().and(q->{
q.eq(LawsMonthlyReportWriteEO::getSaveState, SaveStateEnum.SUBMIT.getValue());
q.or().isNull(LawsMonthlyReportWriteEO::getSaveState);
q.or(wrapper->{
wrapper.eq(LawsMonthlyReportWriteEO::getCreateBy,currentUser.getUsername());
wrapper.eq(LawsMonthlyReportWriteEO::getSaveState,SaveStateEnum.SAVE.getValue());
});
});
//所有的月报
@@ -483,6 +496,17 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
// wrapper.in(LawsMonthlyReportWriteEO::getCreateBy,currentUser.getUsername());
// }
//----------------------------------------------------------------------------------------
//草稿只能自己查看，已提交的所有人都可以查看
LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
wrapper.and(q->{
q.eq(LawsMonthlyReportWriteEO::getSaveState, SaveStateEnum.SUBMIT.getValue());
q.or().isNull(LawsMonthlyReportWriteEO::getSaveState);
q.or(queryWrapper->{
queryWrapper.eq(LawsMonthlyReportWriteEO::getCreateBy,currentUser.getUsername());
queryWrapper.eq(LawsMonthlyReportWriteEO::getSaveState,SaveStateEnum.SAVE.getValue());
});
});
List<LawsMonthlyReportWriteEO> lawsMonthlyReportWriteEOS = this.list(wrapper);
if(lawsMonthlyReportWriteEOS.size() == 0){