diff --git a/src/main/java/cn/palmte/work/bean/CooperateTypeEnum.java b/src/main/java/cn/palmte/work/bean/CooperateTypeEnum.java new file mode 100644 index 0000000..4cef90f --- /dev/null +++ b/src/main/java/cn/palmte/work/bean/CooperateTypeEnum.java @@ -0,0 +1,44 @@ +package cn.palmte.work.bean; + +/** + * @author xiongshiyan at 2021/11/1 , contact me with email yanshixiong@126.com or phone 15208384257 + */ +public enum CooperateTypeEnum { + PLAN_O(-1,""), + PLAN_A(1,"战略合作类"), + PLAN_B(2,"非战略合作类"); + + private int cooperateType; + private String cooperateTypeStr; + + private CooperateTypeEnum(int cooperateType, String cooperateTypeStr) { + this.cooperateType = cooperateType; + this.cooperateTypeStr = cooperateTypeStr; + } + + public int getCooperateType() { + return cooperateType; + } + + public void setCooperateType(int cooperateType) { + this.cooperateType = cooperateType; + } + + public String getCooperateTypeStr() { + return cooperateTypeStr; + } + + public void setCooperateTypeStr(String cooperateTypeStr) { + this.cooperateTypeStr = cooperateTypeStr; + } + + public static CooperateTypeEnum parseCooperateType(int cooperateType){ + if(cooperateType == 1){ + return PLAN_A; + } + if(cooperateType == 2){ + return PLAN_B; + } + throw new IllegalArgumentException("Unkown cooperateType:"+cooperateType); + } +} diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java index 75bdb42..b57c6ff 100644 --- a/src/main/java/cn/palmte/work/model/Project.java +++ b/src/main/java/cn/palmte/work/model/Project.java @@ -200,6 +200,12 @@ public class Project { @Column(name = "underwritten_mode_str") private String underwrittenModeStr; + @Column(name = "cooperate_type") + private Integer cooperateType; + + @Column(name = "cooperate_type_str") + private String cooperateTypeStr; + @Column(name = "certainty") private Integer certainty; @@ -645,6 +651,22 @@ public class Project { this.underwrittenModeStr = underwrittenModeStr; } + public Integer getCooperateType() { + return cooperateType; + } + + public void setCooperateType(Integer cooperateType) { + this.cooperateType = cooperateType; + } + + public String getCooperateTypeStr() { + return cooperateTypeStr; + } + + public void setCooperateTypeStr(String cooperateTypeStr) { + this.cooperateTypeStr = cooperateTypeStr; + } + public Integer getCertainty() { return certainty; } diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index 38ca78b..fbc5515 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -256,7 +256,7 @@ public class ProjectService { public Project addProject(Project project, Admin admin, ApproveStatusEnum approveStatusEnum) { String projectNo = numSeqService.generate(); - if (project.getUnderwrittenMode() != 1) { + if (project.getCooperateType() != 1) { project.setCollaborator(null); project.setCollaboratorUrl(null); } @@ -267,6 +267,7 @@ public class ProjectService { project.setProjectNo(projectNo); project.setTypeDesc(TypeEnum.parseType(project.getType()).getTypeDesc()); project.setUnderwrittenModeStr(UnderwrittenModeEnum.parseUnderwrittenMode(project.getUnderwrittenMode()).getUnderwrittenModeStr()); + project.setCooperateTypeStr(CooperateTypeEnum.parseCooperateType(project.getCooperateType()).getCooperateTypeStr()); project.setCertaintyStr(CertaintyEnum.parseCertainty(project.getCertainty()).getCertaintyStr()); project.setIsSecondStr(IsSecondEnum.parseIsSecond(project.getIsSecond()).getIsSecondStr()); project.setSignTypeStr(SignTypeEnum.parseSignType(project.getSignType()).getSignTypeStr()); @@ -309,6 +310,8 @@ public class ProjectService { projectInDb.setTypeDesc(TypeEnum.parseType(project.getType()).getTypeDesc()); projectInDb.setUnderwrittenMode(project.getUnderwrittenMode()); projectInDb.setUnderwrittenModeStr(UnderwrittenModeEnum.parseUnderwrittenMode(project.getUnderwrittenMode()).getUnderwrittenModeStr()); + projectInDb.setCooperateType(project.getCooperateType()); + projectInDb.setCooperateTypeStr(CooperateTypeEnum.parseCooperateType(project.getCooperateType()).getCooperateTypeStr()); projectInDb.setCertainty(project.getCertainty()); projectInDb.setCertaintyStr(CertaintyEnum.parseCertainty(project.getCertainty()).getCertaintyStr()); projectInDb.setIsSecond(project.getIsSecond()); @@ -318,7 +321,7 @@ public class ProjectService { projectInDb.setResolvePlan(project.getResolvePlan()); projectInDb.setResolvePlanStr(ResolvePlanEnum.parseResolvePlan(project.getResolvePlan()).getResolvePlanStr()); - if (project.getUnderwrittenMode() != 1) { + if (project.getCooperateType() != 1) { projectInDb.setCollaborator(null); projectInDb.setCollaboratorUrl(null); } else { @@ -371,6 +374,8 @@ public class ProjectService { projectInDb.setTypeDesc(TypeEnum.parseType(project.getType()).getTypeDesc()); projectInDb.setUnderwrittenMode(project.getUnderwrittenMode()); projectInDb.setUnderwrittenModeStr(UnderwrittenModeEnum.parseUnderwrittenMode(project.getUnderwrittenMode()).getUnderwrittenModeStr()); + projectInDb.setCooperateType(project.getCooperateType()); + projectInDb.setCooperateTypeStr(CooperateTypeEnum.parseCooperateType(project.getCooperateType()).getCooperateTypeStr()); projectInDb.setCertainty(project.getCertainty()); projectInDb.setCertaintyStr(CertaintyEnum.parseCertainty(project.getCertainty()).getCertaintyStr()); // projectInDb.setIsSecond(project.getIsSecond()); diff --git a/src/main/resources/static/assets/css/admin.css b/src/main/resources/static/assets/css/admin.css index 41173ee..a13ab53 100644 --- a/src/main/resources/static/assets/css/admin.css +++ b/src/main/resources/static/assets/css/admin.css @@ -33,7 +33,7 @@ ul { height: 100%; width: 200px; vertical-align:middle; - background: url(../.././img/logo.png) no-repeat left center; + background: url(../../img/logo.png) no-repeat left center; -webkit-background-size: 125px 24px; background-size: 125px 24px; } diff --git a/src/main/resources/static/img/logo.png b/src/main/resources/static/img/logo.png index c794266..e32cfe7 100644 Binary files a/src/main/resources/static/img/logo.png and b/src/main/resources/static/img/logo.png differ diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index b4e49a5..6c806e1 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -222,35 +222,19 @@