差旅报销相关修改,办件中心相关修改

zjugis-business/src/main/java/com/zjugis/business/flow/travelcost/event/TravelCostEvent.java

@@ -76,7 +76,7 @@ public class TravelCostEvent extends BaseController {
                 Project project = projectService.selectById(entity.getProjectId());
                 entity.setFlowStatus(FLOW_PROCESS);
                 entity.setFlowFinishtime(LocalDateTime.now());
-                travelCostService.updateTravelCost(TravelCostConvert.INSTANCE.convert(entity));
+                travelCostService.updateTravelCostEntity(TravelCostConvert.INSTANCE.convert(entity));
                 String applyTime = LocalDateTimeUtils.format(entity.getApplyTime(), null);
                 String flowDesc = StringUtils.join(Arrays.asList(entity.getUserNickname(), applyTime, "¥" + entity.getTotalAmount(), project.getXmmc()), "/");
                 workflowClient.saveFlowDescribe(flowInstanceId, flowDesc);
@@ -107,7 +107,7 @@ public class TravelCostEvent extends BaseController {
                 TravelCostDO entity = travelCostService.findByInstanceId(flowInstanceId);
                 entity.setFlowStatus(FLOW_FINISHED);
                 entity.setFlowFinishtime(LocalDateTime.now());
-                travelCostService.updateTravelCost(TravelCostConvert.INSTANCE.convert(entity));
+                travelCostService.updateTravelCostEntity(TravelCostConvert.INSTANCE.convert(entity));
                 projectCostService.updateTravelCost(entity.getTotalAmount(),entity.getProjectId());
                 projectService.calcProject(entity.getProjectId());
                 return ok("true");
@@ -136,7 +136,7 @@ public class TravelCostEvent extends BaseController {
                 TravelCostDO entity = travelCostService.findByInstanceId(flowInstanceId);
                 entity.setFlowStatus(FLOW_NULLY);
                 entity.setIsvalid(0);
-                travelCostService.updateTravelCost(TravelCostConvert.INSTANCE.convert(entity));
+                travelCostService.updateTravelCostEntity(TravelCostConvert.INSTANCE.convert(entity));
                 return ok("true");
             } else {
                 throw new BusinessException("执行事件出错，请联系管理员！");
@@ -164,7 +164,7 @@ public class TravelCostEvent extends BaseController {
                 TravelCostDO entity = travelCostService.findByInstanceId(flowInstanceId);
                 entity.setFlowStatus(FLOW_PROCESS);
                 entity.setIsvalid(1);
-                travelCostService.updateTravelCost(TravelCostConvert.INSTANCE.convert(entity));
+                travelCostService.updateTravelCostEntity(TravelCostConvert.INSTANCE.convert(entity));
                 return ok("true");
             } else {
                 throw new BusinessException("执行事件出错，请联系管理员！");
@@ -543,7 +543,7 @@ public class TravelCostEvent extends BaseController {
                 TravelCostDO entity = travelCostService.findByInstanceId(flowInstanceId);
                 entity.setFlowStatus(FLOW_PAYMENT);
                 entity.setFlowFinishtime(LocalDateTime.now());
-                travelCostService.updateTravelCost(TravelCostConvert.INSTANCE.convert(entity));
+                travelCostService.updateTravelCostEntity(TravelCostConvert.INSTANCE.convert(entity));
                 return ok("true");
             } else {
                 throw new BusinessException("执行事件出错，请联系管理员！");
@@ -568,7 +568,7 @@ public class TravelCostEvent extends BaseController {
                 TravelCostDO entity = travelCostService.findByInstanceId(flowInstanceId);
                 entity.setFlowStatus(FLOW_PROCESS);
                 entity.setFlowFinishtime(LocalDateTime.now());
-                travelCostService.updateTravelCost(TravelCostConvert.INSTANCE.convert(entity));
+                travelCostService.updateTravelCostEntity(TravelCostConvert.INSTANCE.convert(entity));
                 return ok("true");
             } else {
                 throw new BusinessException("执行事件出错，请联系管理员！");

zjugis-business/src/main/java/com/zjugis/business/flow/travelcost/service/TravelCostService.java

@@ -113,4 +113,6 @@ public interface TravelCostService {
      * @return
      */
     BigDecimal getTravelCost(Integer year, Set<String> deptIds);
+
+    void updateTravelCostEntity(TravelCostUpdateReqVO updateReqVO);
 }

zjugis-business/src/main/java/com/zjugis/business/flow/travelcost/service/TravelCostServiceImpl.java

@@ -353,6 +353,15 @@ public class TravelCostServiceImpl implements TravelCostService {
         return travelCost;
     }
 
+    @Override
+    public void updateTravelCostEntity(TravelCostUpdateReqVO updateReqVO) {
+        // 校验存在
+        validateTravelCostExists(updateReqVO.getId());
+        // 更新
+        TravelCostDO updateObj = TravelCostConvert.INSTANCE.convert(updateReqVO);
+        travelCostDao.updateById(updateObj);
+    }
+
     private PageResult<TravelCostRespVO> getTravelCostRespVOPageResult(PageResult<TravelCostDO> pageResult) {
         PageResult<TravelCostRespVO> travelCostRespVOPageResult = TravelCostConvert.INSTANCE.convertPage(pageResult);
         if (pageResult.getTotal() > 0) {

zjugis-workflow/src/main/java/com/zjugis/z_workflow/service/IFlowHandlerCountServce.java

@@ -248,7 +248,6 @@ public class IFlowHandlerCountServce {
 		}),
         ARCHIVE("归档", (r, p) -> {
             Map<String, Integer> map = null;
-            //20201014 gaosong 区分办件中心与监控中心的已完成数量统计方式
             try {
                 map = iFlowInstanceDaoBean.listHandlerCaseCountByArchive(p);
             } catch (Exception ex) {

zjugis-workflow/src/main/resources/mapper/oracle/IFlowInstanceMapper.xml

@@ -201,7 +201,7 @@
             FI.I_EXTERNAL IEXT
             from i_activity_instance ai
             inner join i_activity_ins_participant aip on ai.id = aip.activity_instance_id
-            inner join i_flow_instance fi on ai.flow_instance_id=fi.id  and ai.I_END = 0
+            inner join i_flow_instance fi on ai.flow_instance_id=fi.id  and fi.I_END = 0
             <if test="p.isMobile">
                 inner join i_acti_ins_rel_form af on af.activity_instance_id = ai.id
             </if>
@@ -4003,7 +4003,7 @@
         FI.I_EXTERNAL IEXT
         from i_activity_instance ai
         inner join i_activity_ins_participant aip on ai.id = aip.activity_instance_id
-        inner join i_flow_instance fi on ai.flow_instance_id=fi.id and ai.I_END = 1
+        inner join i_flow_instance fi on ai.flow_instance_id=fi.id and fi.I_END = 1
         <if test="p.isMobile">
             inner join i_acti_ins_rel_form af on af.activity_instance_id = ai.id
         </if>