* 查询条件类 @@ -229,258 +219,6 @@ */ private String isProcessOvertime; - - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getCreateTimeBegin() { - return createTimeBegin; - } - - public void setCreateTimeBegin(String createTimeBegin) { - this.createTimeBegin = createTimeBegin; - } - - public String getCreateTimeEnd() { - return createTimeEnd; - } - - public void setCreateTimeEnd(String createTimeEnd) { - this.createTimeEnd = createTimeEnd; - } - - public Long getCreateUser() { - return createUser; - } - - public void setCreateUser(Long createUser) { - this.createUser = createUser; - } - - public String getCloseTimeBegin() { - return closeTimeBegin; - } - - public void setCloseTimeBegin(String closeTimeBegin) { - this.closeTimeBegin = closeTimeBegin; - } - - public String getCloseTimeEnd() { - return closeTimeEnd; - } - - public void setCloseTimeEnd(String closeTimeEnd) { - this.closeTimeEnd = closeTimeEnd; - } - - public String getRegisterTimeBegin() { - return registerTimeBegin; - } - - public void setRegisterTimeBegin(String registerTimeBegin) { - this.registerTimeBegin = registerTimeBegin; - } - - public String getRegisterTime() { - return registerTime; - } - - public void setRegisterTime(String registerTime) { - this.registerTime = registerTime; - } - - public String getRegisterTimeEnd() { - return registerTimeEnd; - } - - public void setRegisterTimeEnd(String registerTimeEnd) { - this.registerTimeEnd = registerTimeEnd; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCaseState() { - return caseState; - } - - public void setCaseState(String caseState) { - this.caseState = caseState; - } - - - public String getIsCloseOvertime() { - return isCloseOvertime; - } - - public void setIsCloseOvertime(String isCloseOvertime) { - this.isCloseOvertime = isCloseOvertime; - } - - public String getSource() { - return source; - } - - public void setSource(String source) { - this.source = source; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getCaseLevel() { - return caseLevel; - } - - public void setCaseLevel(String caseLevel) { - this.caseLevel = caseLevel; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getIsShopCase() { - return isShopCase; - } - - public void setIsShopCase(String isShopCase) { - this.isShopCase = isShopCase; - } - - public String getEbCaseState() { - return ebCaseState; - } - - public void setEbCaseState(String ebCaseState) { - this.ebCaseState = ebCaseState; - } - - public String getReporterPhone() { - return reporterPhone; - } - - public void setReporterPhone(String reporterPhone) { - this.reporterPhone = reporterPhone; - } - - public String getFilingType() { - return filingType; - } - - public void setFilingType(String filingType) { - this.filingType = filingType; - } - - public String getIsDelay() { - return isDelay; - } - - public void setIsDelay(String isDelay) { - this.isDelay = isDelay; - } - - public String getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(String isPostpone) { - this.isPostpone = isPostpone; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getIsRevisit() { - return isRevisit; - } - - public void setIsRevisit(String isRevisit) { - this.isRevisit = isRevisit; - } - - public boolean isDataScope() { - return isDataScope; - } - - public void setDataScope(boolean dataScope) { - isDataScope = dataScope; - } - - public int getSpecialQuery() { - return specialQuery; - } - - public void setSpecialQuery(int specialQuery) { - this.specialQuery = specialQuery; - } - - // @Override // protected Serializable pkVal() { // return this.id; diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java index 672cfd2..5edda35 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/controller/CwsCaseController.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.cwscase.controller; -import com.casic.missiles.core.base.controller.BaseController; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.constant.factory.PageFactory; @@ -10,26 +11,22 @@ import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.cwscase.enums.SpecialQueryEnum; -import com.casic.missiles.modular.cwscase.model.*; +import com.casic.missiles.modular.cwscase.model.CwsCase; +import com.casic.missiles.modular.cwscase.model.QueryCondition; +import com.casic.missiles.modular.cwscase.service.ICwsCaseService; +import com.casic.missiles.modular.cwscase.warpper.CwsCaseWarpper; import com.casic.missiles.modular.enums.CaseLevelEnum; import com.casic.missiles.modular.enums.CaseStateEnum; -import com.casic.missiles.modular.dictexpand.service.IDictExpandService; -import com.casic.missiles.modular.cwscase.service.ICasedetailService; -import com.casic.missiles.modular.cwscase.service.IProcessDetailService; -import com.casic.missiles.modular.cwscase.service.IStatusService; import com.casic.missiles.modular.enums.CwsRoleEnums; import com.casic.missiles.modular.enums.EbCaseStateEnum; -import com.casic.missiles.modular.flowable.service.ICaseFlowService; import com.casic.missiles.modular.system.model.Dict; -import com.casic.missiles.modular.cwscase.warpper.CwsCaseWarpper; import org.hswebframework.expands.office.excel.ExcelIO; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; -import org.springframework.beans.factory.annotation.Autowired; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; import java.text.SimpleDateFormat; @@ -38,18 +35,12 @@ import java.util.List; import java.util.Map; -import com.casic.missiles.modular.cwscase.service.ICwsCaseService; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - /** * 控制器 * * @author dev * @Date 2019-09-23 10:40:47 */ -//@Controller @RestController @RequestMapping("/case") public class CwsCaseController extends ExportController { @@ -61,21 +52,6 @@ @Autowired private ICommonPermissionService service; - @Autowired - private ICasedetailService casedetailService; - - @Autowired - private IStatusService statusService; - - @Autowired - private IProcessDetailService processDetailService; - - @Autowired - private IDictExpandService dictExpandService; - - @Autowired - private ICaseFlowService caseFlowService; - @Value("${casic.office.maxRowsExcel}") private int maxRowsExcel; @Value("${casic.config.config-path}") @@ -418,9 +394,8 @@ if(roles.contains(CwsRoleEnums.PROCESS.getRoleTip())){ String actUserId = String.valueOf(shiroUser.getId()); results = cwsCaseService.workList(page,null,null,actUserId,queryCondition); - } - //pc端的监督指挥系统查看处理中案卷 - else { + } else { + //pc端的监督指挥系统查看处理中案卷 results = cwsCaseService.workList(page,null,null,null,queryCondition); } new CwsCaseWarpper(results).warp(); @@ -822,7 +797,6 @@ else if(roles.contains(CwsRoleEnums.RECEIVER.getRoleTip())){ groupId = CwsRoleEnums.RECEIVER.getRoleTip(); } - results = cwsCaseService.workList(page,groupId,null,null,queryCondition); } diff --git a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java index 2d708b7..438d579 100644 --- a/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java +++ b/casic-service-cws/casic-cws-case/src/main/java/com/casic/missiles/modular/cwscase/model/QueryCondition.java @@ -1,17 +1,7 @@ package com.casic.missiles.modular.cwscase.model; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; -import com.casic.missiles.core.datascope.DataScope; import lombok.Data; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - /** *
* 查询条件类 @@ -229,258 +219,6 @@ */ private String isProcessOvertime; - - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getCreateTimeBegin() { - return createTimeBegin; - } - - public void setCreateTimeBegin(String createTimeBegin) { - this.createTimeBegin = createTimeBegin; - } - - public String getCreateTimeEnd() { - return createTimeEnd; - } - - public void setCreateTimeEnd(String createTimeEnd) { - this.createTimeEnd = createTimeEnd; - } - - public Long getCreateUser() { - return createUser; - } - - public void setCreateUser(Long createUser) { - this.createUser = createUser; - } - - public String getCloseTimeBegin() { - return closeTimeBegin; - } - - public void setCloseTimeBegin(String closeTimeBegin) { - this.closeTimeBegin = closeTimeBegin; - } - - public String getCloseTimeEnd() { - return closeTimeEnd; - } - - public void setCloseTimeEnd(String closeTimeEnd) { - this.closeTimeEnd = closeTimeEnd; - } - - public String getRegisterTimeBegin() { - return registerTimeBegin; - } - - public void setRegisterTimeBegin(String registerTimeBegin) { - this.registerTimeBegin = registerTimeBegin; - } - - public String getRegisterTime() { - return registerTime; - } - - public void setRegisterTime(String registerTime) { - this.registerTime = registerTime; - } - - public String getRegisterTimeEnd() { - return registerTimeEnd; - } - - public void setRegisterTimeEnd(String registerTimeEnd) { - this.registerTimeEnd = registerTimeEnd; - } - - public String getCaseid() { - return caseid; - } - - public void setCaseid(String caseid) { - this.caseid = caseid; - } - - public String getCaseState() { - return caseState; - } - - public void setCaseState(String caseState) { - this.caseState = caseState; - } - - - public String getIsCloseOvertime() { - return isCloseOvertime; - } - - public void setIsCloseOvertime(String isCloseOvertime) { - this.isCloseOvertime = isCloseOvertime; - } - - public String getSource() { - return source; - } - - public void setSource(String source) { - this.source = source; - } - - public String getEorc() { - return eorc; - } - - public void setEorc(String eorc) { - this.eorc = eorc; - } - - public String getCasetypeCode() { - return casetypeCode; - } - - public void setCasetypeCode(String casetypeCode) { - this.casetypeCode = casetypeCode; - } - - public String getCasetypeDetailCode() { - return casetypeDetailCode; - } - - public void setCasetypeDetailCode(String casetypeDetailCode) { - this.casetypeDetailCode = casetypeDetailCode; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getFieldintro() { - return fieldintro; - } - - public void setFieldintro(String fieldintro) { - this.fieldintro = fieldintro; - } - - public String getCaseLevel() { - return caseLevel; - } - - public void setCaseLevel(String caseLevel) { - this.caseLevel = caseLevel; - } - - public String getOnedeptid() { - return onedeptid; - } - - public void setOnedeptid(String onedeptid) { - this.onedeptid = onedeptid; - } - - public String getIsShopCase() { - return isShopCase; - } - - public void setIsShopCase(String isShopCase) { - this.isShopCase = isShopCase; - } - - public String getEbCaseState() { - return ebCaseState; - } - - public void setEbCaseState(String ebCaseState) { - this.ebCaseState = ebCaseState; - } - - public String getReporterPhone() { - return reporterPhone; - } - - public void setReporterPhone(String reporterPhone) { - this.reporterPhone = reporterPhone; - } - - public String getFilingType() { - return filingType; - } - - public void setFilingType(String filingType) { - this.filingType = filingType; - } - - public String getIsDelay() { - return isDelay; - } - - public void setIsDelay(String isDelay) { - this.isDelay = isDelay; - } - - public String getIsPostpone() { - return isPostpone; - } - - public void setIsPostpone(String isPostpone) { - this.isPostpone = isPostpone; - } - - public String getIsOvertime() { - return isOvertime; - } - - public void setIsOvertime(String isOvertime) { - this.isOvertime = isOvertime; - } - - public String getIsRevisit() { - return isRevisit; - } - - public void setIsRevisit(String isRevisit) { - this.isRevisit = isRevisit; - } - - public boolean isDataScope() { - return isDataScope; - } - - public void setDataScope(boolean dataScope) { - isDataScope = dataScope; - } - - public int getSpecialQuery() { - return specialQuery; - } - - public void setSpecialQuery(int specialQuery) { - this.specialQuery = specialQuery; - } - - // @Override // protected Serializable pkVal() { // return this.id; diff --git a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java index cc02926..29979f0 100644 --- a/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java +++ b/casic-service-cws/casic-cws-flow/src/main/java/com/casic/missiles/modular/flowable/controller/ProcessController.java @@ -108,6 +108,13 @@ dto.setChangeState(CaseStateEnum.TO_BE_HANDLED.getState()); caseFlowService.completeCaseTask(dto); } + //处理审核派发核查 + if(CaseStateEnum.TO_BE_CHECKED.getState()==dto.getChangeState()){ + dto.setCurrState(CaseStateEnum.TO_BE_CHECKED.getState()); + dto.setChangeState(CaseStateEnum.CHECK_SCENE.getState()); + caseFlowService.completeCaseTask(dto); + } + return ResponseData.success(); }