diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersonaction/BasicCheckPersonActionDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersonaction/BasicCheckPersonActionDTO.java index 904a9e5..94759f2 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersonaction/BasicCheckPersonActionDTO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersonaction/BasicCheckPersonActionDTO.java @@ -22,6 +22,10 @@ public class BasicCheckPersonActionDTO { @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称") private String dutyIndexLibName; + @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标名称") + private String dutyIndexLibParentName; + + @ApiModelProperty(name = "dutyTitle", value = "上报标题") private String dutyTitle; @ApiModelProperty(name = "actionTime", value = "时间") @@ -189,4 +193,12 @@ public class BasicCheckPersonActionDTO { public void setPhoto(String photo) { this.photo = photo; } + + public String getDutyIndexLibParentName() { + return dutyIndexLibParentName; + } + + public void setDutyIndexLibParentName(String dutyIndexLibParentName) { + this.dutyIndexLibParentName = dutyIndexLibParentName; + } } diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersoninfo/BasicCheckPersonInfoDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersoninfo/BasicCheckPersonInfoDTO.java index f070033..c533d81 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersoninfo/BasicCheckPersonInfoDTO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/basiccheckpersoninfo/BasicCheckPersonInfoDTO.java @@ -22,6 +22,9 @@ public class BasicCheckPersonInfoDTO { @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称") private String dutyIndexLibName; + @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标名称") + private String dutyIndexLibParentName; + @ApiModelProperty(name = "dutyTitle", value = "上报标题") private String dutyTitle; @ApiModelProperty(name = "orgName", value = "单位名称") @@ -270,4 +273,12 @@ public class BasicCheckPersonInfoDTO { public void setEducationName(String educationName) { this.educationName = educationName; } + + public String getDutyIndexLibParentName() { + return dutyIndexLibParentName; + } + + public void setDutyIndexLibParentName(String dutyIndexLibParentName) { + this.dutyIndexLibParentName = dutyIndexLibParentName; + } } diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/dutylistform/HeartTalkDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/dutylistform/HeartTalkDTO.java index 15a7704..5f008c0 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/dtos/dutylistform/HeartTalkDTO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/dutylistform/HeartTalkDTO.java @@ -14,6 +14,15 @@ public class HeartTalkDTO { private String reportId; @ApiModelProperty(name = "dutyIndexLibId", value = "责任清单ID") private String dutyIndexLibId; + + @ApiModelProperty(name = "dutyIndexLibName", value = "责任清单ID") + private String dutyIndexLibName; + @ApiModelProperty(name = "dutyIndexLibParentName", value = "责任清单ID") + private String dutyIndexLibParentName; + + + + @ApiModelProperty(name = "dutyTitle", value = "上报标题") private String dutyTitle; @ApiModelProperty(name = "orgName", value = "单位名称") @@ -70,6 +79,22 @@ public class HeartTalkDTO { private String talkPlace2; + public String getDutyIndexLibName() { + return dutyIndexLibName; + } + + public void setDutyIndexLibName(String dutyIndexLibName) { + this.dutyIndexLibName = dutyIndexLibName; + } + + public String getDutyIndexLibParentName() { + return dutyIndexLibParentName; + } + + public void setDutyIndexLibParentName(String dutyIndexLibParentName) { + this.dutyIndexLibParentName = dutyIndexLibParentName; + } + public String getDutyTitle() { return dutyTitle; } diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/dutylistform/PartyCleanMeetingDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/dutylistform/PartyCleanMeetingDTO.java index 4eacaef..fc1dfc6 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/dtos/dutylistform/PartyCleanMeetingDTO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/dutylistform/PartyCleanMeetingDTO.java @@ -14,6 +14,15 @@ public class PartyCleanMeetingDTO { private String reportId; @ApiModelProperty(name = "dutyIndexLibId", value = "责任清单ID") private String dutyIndexLibId; + @ApiModelProperty(name = "dutyIndexLibName", value = "责任清单名称") + private String dutyIndexLibName; + @ApiModelProperty(name = "dutyIndexLibParentName", value = "责任清单ID") + private String dutyIndexLibParentName; + + + + + @ApiModelProperty(name = "title", value = "标题") private String title; @ApiModelProperty(name = "meetingTime", value = "会议时间") @@ -221,4 +230,20 @@ public class PartyCleanMeetingDTO { public void setMeetingPhoto(String meetingPhoto) { this.meetingPhoto = meetingPhoto; } + + public String getDutyIndexLibName() { + return dutyIndexLibName; + } + + public void setDutyIndexLibName(String dutyIndexLibName) { + this.dutyIndexLibName = dutyIndexLibName; + } + + public String getDutyIndexLibParentName() { + return dutyIndexLibParentName; + } + + public void setDutyIndexLibParentName(String dutyIndexLibParentName) { + this.dutyIndexLibParentName = dutyIndexLibParentName; + } } diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/entityres/EntityResDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/entityres/EntityResDTO.java index da303b1..714fcb8 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/dtos/entityres/EntityResDTO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/entityres/EntityResDTO.java @@ -20,6 +20,9 @@ public class EntityResDTO { private String dutyIndexLibId; @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称") private String dutyIndexLibName; + @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标名称") + private String dutyIndexLibParentName; + @ApiModelProperty(name = "entityResTitle", value = "主体责任台账上报标题") private String entityResTitle; @ApiModelProperty(name = "entityResType", value = "上报类型 1.具体事项 2.监督情况 3.备注") @@ -157,4 +160,12 @@ public class EntityResDTO { public void setIndexAuditStatus(String indexAuditStatus) { this.indexAuditStatus = indexAuditStatus; } + + public String getDutyIndexLibParentName() { + return dutyIndexLibParentName; + } + + public void setDutyIndexLibParentName(String dutyIndexLibParentName) { + this.dutyIndexLibParentName = dutyIndexLibParentName; + } } diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/indexgeneral/IndexGeneralDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/indexgeneral/IndexGeneralDTO.java index 60e598e..3f48483 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/dtos/indexgeneral/IndexGeneralDTO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/indexgeneral/IndexGeneralDTO.java @@ -20,6 +20,9 @@ public class IndexGeneralDTO { private String dutyIndexLibId; @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称") private String dutyIndexLibName; + @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标上级名称") + private String dutyIndexLibParentName; + @ApiModelProperty(name = "indexGeneralTitle", value = "上报标题") private String indexGeneralTitle; @ApiModelProperty(name = "indexGeneralContent", value = "上报正文") @@ -136,4 +139,12 @@ public class IndexGeneralDTO { public void setIndexAuditStatus(String indexAuditStatus) { this.indexAuditStatus = indexAuditStatus; } + + public String getDutyIndexLibParentName() { + return dutyIndexLibParentName; + } + + public void setDutyIndexLibParentName(String dutyIndexLibParentName) { + this.dutyIndexLibParentName = dutyIndexLibParentName; + } } diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/partycommitteemeeting/PartyCommitteeMeetingDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/partycommitteemeeting/PartyCommitteeMeetingDTO.java index 0fa6c7a..f52758c 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/dtos/partycommitteemeeting/PartyCommitteeMeetingDTO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/partycommitteemeeting/PartyCommitteeMeetingDTO.java @@ -18,6 +18,8 @@ public class PartyCommitteeMeetingDTO { private String dutyIndexLibId; @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称") private String dutyIndexLibName; + @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标名称") + private String dutyIndexLibParentName; @ApiModelProperty(name = "partyCommitteeMeetingId", value = "党委会上报ID") private String partyCommitteeMeetingId; @ApiModelProperty(name = "partyCommitteeMeetingType", value = "上报类型") @@ -45,7 +47,13 @@ public class PartyCommitteeMeetingDTO { private String indexAuditStatus; + public String getDutyIndexLibParentName() { + return dutyIndexLibParentName; + } + public void setDutyIndexLibParentName(String dutyIndexLibParentName) { + this.dutyIndexLibParentName = dutyIndexLibParentName; + } public String getDutyIndexLibId() { return dutyIndexLibId; diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/partypunishinfo/PartyPunishInfoDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/partypunishinfo/PartyPunishInfoDTO.java index f36f8c0..3dca464 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/dtos/partypunishinfo/PartyPunishInfoDTO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/partypunishinfo/PartyPunishInfoDTO.java @@ -22,6 +22,9 @@ public class PartyPunishInfoDTO { @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称") private String dutyIndexLibName; + @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标名称") + private String dutyIndexLibParentName; + @ApiModelProperty(name = "dutyTitle", value = "上报标题") private String dutyTitle; @ApiModelProperty(name = "personName", value = "姓名") @@ -257,4 +260,12 @@ public class PartyPunishInfoDTO { public void setCreatorName(String creatorName) { this.creatorName = creatorName; } + + public String getDutyIndexLibParentName() { + return dutyIndexLibParentName; + } + + public void setDutyIndexLibParentName(String dutyIndexLibParentName) { + this.dutyIndexLibParentName = dutyIndexLibParentName; + } } diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/problemclue/ProblemClueDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/problemclue/ProblemClueDTO.java index a63a349..87f83dd 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/dtos/problemclue/ProblemClueDTO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/problemclue/ProblemClueDTO.java @@ -23,6 +23,9 @@ public class ProblemClueDTO { @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称") private String dutyIndexLibName; + @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标名称") + private String dutyIndexLibParentName; + @ApiModelProperty(name = "dutyTitle", value = "上报标题") private String dutyTitle; @ApiModelProperty(name = "caseNumber", value = "案件号") @@ -300,4 +303,12 @@ public class ProblemClueDTO { public void setClueTypeName(String clueTypeName) { this.clueTypeName = clueTypeName; } + + public String getDutyIndexLibParentName() { + return dutyIndexLibParentName; + } + + public void setDutyIndexLibParentName(String dutyIndexLibParentName) { + this.dutyIndexLibParentName = dutyIndexLibParentName; + } } diff --git a/src/main/java/com/tenlion/twoduty/pojo/dtos/supervisecheck/SuperviseCheckDTO.java b/src/main/java/com/tenlion/twoduty/pojo/dtos/supervisecheck/SuperviseCheckDTO.java index cd1f3e6..33b2d93 100644 --- a/src/main/java/com/tenlion/twoduty/pojo/dtos/supervisecheck/SuperviseCheckDTO.java +++ b/src/main/java/com/tenlion/twoduty/pojo/dtos/supervisecheck/SuperviseCheckDTO.java @@ -22,6 +22,9 @@ public class SuperviseCheckDTO { @ApiModelProperty(name = "dutyIndexLibName", value = "指标名称") private String dutyIndexLibName; + @ApiModelProperty(name = "dutyIndexLibParentName", value = "指标名称") + private String dutyIndexLibParentName; + @ApiModelProperty(name = "dutyTitle", value = "上报标题") private String dutyTitle; @ApiModelProperty(name = "checkPhotos", value = "附加图片") @@ -194,4 +197,12 @@ public class SuperviseCheckDTO { public void setGmtCreate(String gmtCreate) { this.gmtCreate = gmtCreate; } + + public String getDutyIndexLibParentName() { + return dutyIndexLibParentName; + } + + public void setDutyIndexLibParentName(String dutyIndexLibParentName) { + this.dutyIndexLibParentName = dutyIndexLibParentName; + } } diff --git a/src/main/java/com/tenlion/twoduty/service/basiccheckpersonaction/impl/BasicCheckPersonActionServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/basiccheckpersonaction/impl/BasicCheckPersonActionServiceImpl.java index a27f955..ecdc5cf 100644 --- a/src/main/java/com/tenlion/twoduty/service/basiccheckpersonaction/impl/BasicCheckPersonActionServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/basiccheckpersonaction/impl/BasicCheckPersonActionServiceImpl.java @@ -1,7 +1,9 @@ package com.tenlion.twoduty.service.basiccheckpersonaction.impl; +import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO; import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO; import com.tenlion.twoduty.service.indexaudit.IIndexAuditService; +import com.tenlion.twoduty.service.indexlib.IIndexLibService; import com.tenlion.twoduty.utils.AuditStatusEnum; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; @@ -37,6 +39,8 @@ public class BasicCheckPersonActionServiceImpl extends DefaultBaseService implem private IBasicCheckPersonActionDao basicCheckPersonActionDao; @Autowired private IIndexAuditService iIndexAuditService; + @Autowired + private IIndexLibService iIndexLibService; @Override @@ -143,7 +147,10 @@ public class BasicCheckPersonActionServiceImpl extends DefaultBaseService implem public BasicCheckPersonActionDTO get(String basicCheckPersonActionId) { Map params = super.getHashMap(2); params.put("reportId", basicCheckPersonActionId); - return get(params); + BasicCheckPersonActionDTO basicCheckPersonActionDTO = get(params); + IndexLibDTO parentParent = iIndexLibService.getParentParent(basicCheckPersonActionDTO.getDutyIndexLibId()); + basicCheckPersonActionDTO.setDutyIndexLibParentName(parentParent.getIndexLibParentName()); + return basicCheckPersonActionDTO; } @Override diff --git a/src/main/java/com/tenlion/twoduty/service/basiccheckpersoninfo/impl/BasicCheckPersonInfoServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/basiccheckpersoninfo/impl/BasicCheckPersonInfoServiceImpl.java index 2176d90..b35bc1f 100644 --- a/src/main/java/com/tenlion/twoduty/service/basiccheckpersoninfo/impl/BasicCheckPersonInfoServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/basiccheckpersoninfo/impl/BasicCheckPersonInfoServiceImpl.java @@ -1,7 +1,9 @@ package com.tenlion.twoduty.service.basiccheckpersoninfo.impl; +import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO; import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO; import com.tenlion.twoduty.service.indexaudit.IIndexAuditService; +import com.tenlion.twoduty.service.indexlib.IIndexLibService; import com.tenlion.twoduty.utils.AuditStatusEnum; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; @@ -37,6 +39,8 @@ public class BasicCheckPersonInfoServiceImpl extends DefaultBaseService implemen private IBasicCheckPersonInfoDao basicCheckPersonInfoDao; @Autowired private IIndexAuditService iIndexAuditService; + @Autowired + private IIndexLibService indexLibService; @Override public void save(BasicCheckPersonInfoVO basicCheckPersonInfoVO) { @@ -143,7 +147,10 @@ public class BasicCheckPersonInfoServiceImpl extends DefaultBaseService implemen public BasicCheckPersonInfoDTO get(String basicCheckPersonInfoId) { Map params = super.getHashMap(2); params.put("reportId", basicCheckPersonInfoId); - return get(params); + BasicCheckPersonInfoDTO basicCheckPersonInfoDTO = get(params); + IndexLibDTO parentParent = indexLibService.getParentParent(basicCheckPersonInfoDTO.getDutyIndexLibId()); + basicCheckPersonInfoDTO.setDutyIndexLibParentName(parentParent.getIndexLibParentName()); + return basicCheckPersonInfoDTO; } @Override diff --git a/src/main/java/com/tenlion/twoduty/service/dutylistform/impl/DutyListFormServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/dutylistform/impl/DutyListFormServiceImpl.java index 6f2bfb6..570cf77 100644 --- a/src/main/java/com/tenlion/twoduty/service/dutylistform/impl/DutyListFormServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/dutylistform/impl/DutyListFormServiceImpl.java @@ -5,10 +5,12 @@ import com.github.pagehelper.PageInfo; import com.tenlion.twoduty.dao.dutylistform.IDutyListFormDao; import com.tenlion.twoduty.pojo.dtos.dutylistform.HeartTalkDTO; import com.tenlion.twoduty.pojo.dtos.dutylistform.PartyCleanMeetingDTO; +import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO; import com.tenlion.twoduty.pojo.vos.dutylistform.PartyCleanMeetingVO; import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO; import com.tenlion.twoduty.service.dutylistform.IDutyListFormService; import com.tenlion.twoduty.service.indexaudit.IIndexAuditService; +import com.tenlion.twoduty.service.indexlib.IIndexLibService; import com.tenlion.twoduty.utils.AuditStatusEnum; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; @@ -34,6 +36,8 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty private IDutyListFormDao dutyListFormDao; @Autowired private IIndexAuditService iIndexAuditService; + @Autowired + private IIndexLibService indexLibService; @Override public SuccessResultList> listPagePartyCleanMeeting(ListPage page) { @@ -46,7 +50,12 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty @Override public PartyCleanMeetingDTO getPartyCleanMeeting(Map params) { - return dutyListFormDao.getPartyCleanMeeting(params); + PartyCleanMeetingDTO partyCleanMeeting = dutyListFormDao.getPartyCleanMeeting(params); + IndexLibDTO parentParent = indexLibService.getParentParent(partyCleanMeeting.getDutyIndexLibId()); + partyCleanMeeting.setDutyIndexLibParentName(parentParent.getIndexLibParentName()); + IndexLibDTO indexLibDTO = indexLibService.get(partyCleanMeeting.getDutyIndexLibId()); + partyCleanMeeting.setDutyIndexLibName(indexLibDTO.getIndexLibName()); + return partyCleanMeeting; } @Override @@ -91,7 +100,12 @@ public class DutyListFormServiceImpl extends DefaultBaseService implements IDuty @Override public HeartTalkDTO getHeartTalk(Map params) { - return dutyListFormDao.getHeartTalk(params); + HeartTalkDTO heartTalk = dutyListFormDao.getHeartTalk(params); + IndexLibDTO parentParent = indexLibService.getParentParent(heartTalk.getDutyIndexLibId()); + heartTalk.setDutyIndexLibParentName(parentParent.getIndexLibParentName()); + IndexLibDTO indexLibDTO = indexLibService.get(heartTalk.getDutyIndexLibId()); + heartTalk.setDutyIndexLibName(indexLibDTO.getIndexLibName()); + return heartTalk; } @Override diff --git a/src/main/java/com/tenlion/twoduty/service/entityres/impl/EntityResServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/entityres/impl/EntityResServiceImpl.java index 32e577a..3eec1a7 100644 --- a/src/main/java/com/tenlion/twoduty/service/entityres/impl/EntityResServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/entityres/impl/EntityResServiceImpl.java @@ -1,7 +1,9 @@ package com.tenlion.twoduty.service.entityres.impl; +import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO; import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO; import com.tenlion.twoduty.service.indexaudit.IIndexAuditService; +import com.tenlion.twoduty.service.indexlib.IIndexLibService; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResult; @@ -36,6 +38,8 @@ public class EntityResServiceImpl extends DefaultBaseService implements IEntityR private IEntityResDao entityResDao; @Autowired private IIndexAuditService iIndexAuditService; + @Autowired + private IIndexLibService iIndexLibService; @Override public void save(EntityResVO entityResVO) { @@ -133,7 +137,10 @@ public class EntityResServiceImpl extends DefaultBaseService implements IEntityR public EntityResDTO get(String entityResId) { Map params = super.getHashMap(2); params.put("entityResId", entityResId); - return get(params); + EntityResDTO entityResDTO = get(params); + IndexLibDTO parentParent = iIndexLibService.getParentParent(entityResDTO.getDutyIndexLibId()); + entityResDTO.setDutyIndexLibParentName(parentParent.getIndexLibParentName()); + return entityResDTO; } @Override diff --git a/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java index b449142..caa8217 100644 --- a/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/indexgeneral/impl/IndexGeneralServiceImpl.java @@ -1,9 +1,11 @@ package com.tenlion.twoduty.service.indexgeneral.impl; +import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO; import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO; import com.tenlion.twoduty.pojo.vos.indexauditlog.IndexAuditLogVO; import com.tenlion.twoduty.service.indexaudit.IIndexAuditService; import com.tenlion.twoduty.service.indexauditlog.IIndexAuditLogService; +import com.tenlion.twoduty.service.indexlib.IIndexLibService; import com.tenlion.twoduty.utils.AuditStatusEnum; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.common.component.SecurityComponent; @@ -41,6 +43,8 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde private IIndexGeneralDao indexGeneralDao; @Autowired private IIndexAuditService iIndexAuditService; + @Autowired + private IIndexLibService iIndexLibService; @Override public void save(IndexGeneralVO indexGeneralVO) { @@ -146,7 +150,10 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde public IndexGeneralDTO get(String indexGeneralId) { Map params = super.getHashMap(2); params.put("indexGeneralId", indexGeneralId); - return get(params); + IndexGeneralDTO indexGeneralDTO = get(params); + IndexLibDTO indexLibDTO = iIndexLibService.getParentParent(indexGeneralDTO.getDutyIndexLibId()); + indexGeneralDTO.setDutyIndexLibParentName(indexLibDTO.getIndexLibParentName()); + return indexGeneralDTO; } @Override @@ -202,5 +209,9 @@ public class IndexGeneralServiceImpl extends DefaultBaseService implements IInde Integer count = indexGeneralDao.count(params); return count == null ? 0 : count; } + + + + } \ No newline at end of file diff --git a/src/main/java/com/tenlion/twoduty/service/indexlib/IIndexLibService.java b/src/main/java/com/tenlion/twoduty/service/indexlib/IIndexLibService.java index b10c0d8..ba8a9ac 100644 --- a/src/main/java/com/tenlion/twoduty/service/indexlib/IIndexLibService.java +++ b/src/main/java/com/tenlion/twoduty/service/indexlib/IIndexLibService.java @@ -21,6 +21,14 @@ import java.util.Map; **/ public interface IIndexLibService { + + /** + * 获取父级的父级 + * @param indexLibId + * @return + */ + IndexLibDTO getParentParent(String indexLibId); + /** * 获取web显示的指标 * @param indexLibParentId diff --git a/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java index ef61c67..ae043e4 100644 --- a/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/indexlib/impl/IndexLibServiceImpl.java @@ -56,6 +56,24 @@ public class IndexLibServiceImpl extends DefaultBaseService implements IIndexLib */ private final static String ROLE_CODE_2 ="0002"; + + /** + * 获取父级的父级 + * @param indexLibId + * @return + */ + public IndexLibDTO getParentParent(String indexLibId){ + IndexLibDTO indexLibDTO = null; + indexLibDTO = this.get(indexLibId); + if(!"0".equals(indexLibDTO.getIndexLibParentId())){ + indexLibDTO = this.get(indexLibDTO.getIndexLibParentId()); + } + return indexLibDTO; + } + + + + /** * 获取web显示的指标 * @param indexLibParentId diff --git a/src/main/java/com/tenlion/twoduty/service/partycommitteemeeting/impl/PartyCommitteeMeetingServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/partycommitteemeeting/impl/PartyCommitteeMeetingServiceImpl.java index f2a696d..be5b431 100644 --- a/src/main/java/com/tenlion/twoduty/service/partycommitteemeeting/impl/PartyCommitteeMeetingServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/partycommitteemeeting/impl/PartyCommitteeMeetingServiceImpl.java @@ -1,7 +1,9 @@ package com.tenlion.twoduty.service.partycommitteemeeting.impl; +import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO; import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO; import com.tenlion.twoduty.service.indexaudit.IIndexAuditService; +import com.tenlion.twoduty.service.indexlib.IIndexLibService; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResult; @@ -36,7 +38,8 @@ public class PartyCommitteeMeetingServiceImpl extends DefaultBaseService impleme private IPartyCommitteeMeetingDao partyCommitteeMeetingDao; @Autowired private IIndexAuditService iIndexAuditService; - + @Autowired + private IIndexLibService indexLibService; @Override @@ -135,7 +138,10 @@ public class PartyCommitteeMeetingServiceImpl extends DefaultBaseService impleme public PartyCommitteeMeetingDTO get(String partyCommitteeMeetingId) { Map params = super.getHashMap(2); params.put("partyCommitteeMeetingId", partyCommitteeMeetingId); - return get(params); + PartyCommitteeMeetingDTO partyCommitteeMeetingDTO = get(params); + IndexLibDTO parentParent = indexLibService.getParentParent(partyCommitteeMeetingDTO.getDutyIndexLibId()); + partyCommitteeMeetingDTO.setDutyIndexLibParentName(parentParent.getIndexLibParentName()); + return partyCommitteeMeetingDTO; } @Override diff --git a/src/main/java/com/tenlion/twoduty/service/partypunishinfo/impl/PartyPunishInfoServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/partypunishinfo/impl/PartyPunishInfoServiceImpl.java index 133498a..32473a6 100644 --- a/src/main/java/com/tenlion/twoduty/service/partypunishinfo/impl/PartyPunishInfoServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/partypunishinfo/impl/PartyPunishInfoServiceImpl.java @@ -1,7 +1,9 @@ package com.tenlion.twoduty.service.partypunishinfo.impl; +import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO; import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO; import com.tenlion.twoduty.service.indexaudit.IIndexAuditService; +import com.tenlion.twoduty.service.indexlib.IIndexLibService; import com.tenlion.twoduty.utils.AuditStatusEnum; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; @@ -37,6 +39,8 @@ public class PartyPunishInfoServiceImpl extends DefaultBaseService implements IP private IPartyPunishInfoDao partyPunishInfoDao; @Autowired private IIndexAuditService iIndexAuditService; + @Autowired + private IIndexLibService indexLibService; @Override public void save(PartyPunishInfoVO partyPunishInfoVO) { @@ -139,7 +143,10 @@ public class PartyPunishInfoServiceImpl extends DefaultBaseService implements IP public PartyPunishInfoDTO get(String reportId) { Map params = super.getHashMap(2); params.put("reportId", reportId); - return get(params); + PartyPunishInfoDTO partyPunishInfoDTO = get(params); + IndexLibDTO parentParent = indexLibService.getParentParent(partyPunishInfoDTO.getDutyIndexLibId()); + partyPunishInfoDTO.setDutyIndexLibParentName(parentParent.getIndexLibParentName()); + return partyPunishInfoDTO; } @Override diff --git a/src/main/java/com/tenlion/twoduty/service/problemclue/impl/ProblemClueServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/problemclue/impl/ProblemClueServiceImpl.java index e0486e3..1042c8d 100644 --- a/src/main/java/com/tenlion/twoduty/service/problemclue/impl/ProblemClueServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/problemclue/impl/ProblemClueServiceImpl.java @@ -1,7 +1,9 @@ package com.tenlion.twoduty.service.problemclue.impl; +import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO; import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO; import com.tenlion.twoduty.service.indexaudit.IIndexAuditService; +import com.tenlion.twoduty.service.indexlib.IIndexLibService; import com.tenlion.twoduty.utils.AuditStatusEnum; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; @@ -37,6 +39,8 @@ public class ProblemClueServiceImpl extends DefaultBaseService implements IProbl private IProblemClueDao problemClueDao; @Autowired private IIndexAuditService iIndexAuditService; + @Autowired + private IIndexLibService indexLibService; @Override @@ -145,7 +149,10 @@ public class ProblemClueServiceImpl extends DefaultBaseService implements IProbl public ProblemClueDTO get(String problemClueId) { Map params = super.getHashMap(2); params.put("reportId", problemClueId); - return get(params); + ProblemClueDTO problemClueDTO = get(params); + IndexLibDTO parentParent = indexLibService.getParentParent(problemClueDTO.getDutyIndexLibId()); + problemClueDTO.setDutyIndexLibParentName(parentParent.getIndexLibParentName()); + return problemClueDTO; } @Override diff --git a/src/main/java/com/tenlion/twoduty/service/supervisecheck/impl/SuperviseCheckServiceImpl.java b/src/main/java/com/tenlion/twoduty/service/supervisecheck/impl/SuperviseCheckServiceImpl.java index 7d6b555..16fcf91 100644 --- a/src/main/java/com/tenlion/twoduty/service/supervisecheck/impl/SuperviseCheckServiceImpl.java +++ b/src/main/java/com/tenlion/twoduty/service/supervisecheck/impl/SuperviseCheckServiceImpl.java @@ -1,7 +1,9 @@ package com.tenlion.twoduty.service.supervisecheck.impl; +import com.tenlion.twoduty.pojo.dtos.indexlib.IndexLibDTO; import com.tenlion.twoduty.pojo.vos.indexaudit.IndexAuditVO; import com.tenlion.twoduty.service.indexaudit.IIndexAuditService; +import com.tenlion.twoduty.service.indexlib.IIndexLibService; import com.tenlion.twoduty.utils.AuditStatusEnum; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; @@ -37,6 +39,8 @@ public class SuperviseCheckServiceImpl extends DefaultBaseService implements ISu private ISuperviseCheckDao superviseCheckDao; @Autowired private IIndexAuditService iIndexAuditService; + @Autowired + private IIndexLibService indexLibService; @Override public void save(SuperviseCheckVO superviseCheckVO) { @@ -139,7 +143,10 @@ public class SuperviseCheckServiceImpl extends DefaultBaseService implements ISu public SuperviseCheckDTO get(String superviseCheckId) { Map params = super.getHashMap(2); params.put("reportId", superviseCheckId); - return get(params); + SuperviseCheckDTO superviseCheckDTO = get(params); + IndexLibDTO parentParent = indexLibService.getParentParent(superviseCheckDTO.getDutyIndexLibId()); + superviseCheckDTO.setDutyIndexLibParentName(parentParent.getIndexLibParentName()); + return superviseCheckDTO; } @Override diff --git a/src/main/java/com/tenlion/twoduty/utils/WeatherUtil.java b/src/main/java/com/tenlion/twoduty/utils/WeatherUtil.java index 1706bc0..cb55f43 100644 --- a/src/main/java/com/tenlion/twoduty/utils/WeatherUtil.java +++ b/src/main/java/com/tenlion/twoduty/utils/WeatherUtil.java @@ -1,5 +1,6 @@ package com.tenlion.twoduty.utils; +import com.alibaba.druid.support.logging.Log; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/resources/mybatis/mapper/indexlib/indexLib-mapper.xml b/src/main/resources/mybatis/mapper/indexlib/indexLib-mapper.xml index 8cd5c61..2b6b815 100644 --- a/src/main/resources/mybatis/mapper/indexlib/indexLib-mapper.xml +++ b/src/main/resources/mybatis/mapper/indexlib/indexLib-mapper.xml @@ -63,6 +63,9 @@ + + + + diff --git a/src/main/resources/templates/articlecontent/type/save-type.html b/src/main/resources/templates/articlecontent/type/save-type.html index 34fe782..576efd6 100644 --- a/src/main/resources/templates/articlecontent/type/save-type.html +++ b/src/main/resources/templates/articlecontent/type/save-type.html @@ -68,7 +68,7 @@
- +
diff --git a/src/main/resources/templates/articlecontent/type/update-type.html b/src/main/resources/templates/articlecontent/type/update-type.html index 048436b..3019152 100644 --- a/src/main/resources/templates/articlecontent/type/update-type.html +++ b/src/main/resources/templates/articlecontent/type/update-type.html @@ -68,7 +68,7 @@
- +
diff --git a/src/main/resources/templates/articlecontent/update.html b/src/main/resources/templates/articlecontent/update.html index 1c67594..3f01a3c 100644 --- a/src/main/resources/templates/articlecontent/update.html +++ b/src/main/resources/templates/articlecontent/update.html @@ -83,7 +83,7 @@
- +