Merge remote-tracking branch 'origin/feature/shenyan_shangbao' into feature/shenyan_shangbao

esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java

@@ -8,6 +8,7 @@
 
 package com.elink.esua.epdc.controller;
 
+import cn.hutool.core.convert.Convert;
 import com.elink.esua.epdc.common.token.dto.*;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
@@ -16,10 +17,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.dto.AuthorizationDTO;
+import com.elink.esua.epdc.dto.*;
-import com.elink.esua.epdc.dto.LoginDTO;
-import com.elink.esua.epdc.dto.SysUserAnalysisOpenIdFormDTO;
-import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO;
 import com.elink.esua.epdc.service.AuthService;
 import com.elink.esua.epdc.service.CaptchaService;
 import com.elink.esua.epdc.service.ResourceService;
@@ -87,6 +85,25 @@ public class AuthController {
         return new Result<AuthorizationDTO>().ok(authorization);
     }
 
+    @PostMapping(value = "autologin")
+    @ApiOperation(value = "自动登录")
+    public Result<AuthorizationDTO> autoLogin(@RequestBody AutoLoginDTO login) {
+        //效验数据
+        ValidatorUtils.validateEntity(login);
+
+        // 特定账号才可以免登录
+        boolean flag = "screen".equals(login.getUsername());
+        if (!flag) {
+            return new Result<AuthorizationDTO>().error(ErrorCode.FORBIDDEN);
+        }
+        login.setPassword("123");
+        LoginDTO loginDTO = ConvertUtils.sourceToTarget(login, LoginDTO.class);
+        //获取登录授权信息
+        AuthorizationDTO authorization = authService.login(loginDTO);
+
+        return new Result<AuthorizationDTO>().ok(authorization);
+    }
+
     /**
      *
      * 工作端-获取token

esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/dto/AutoLoginDTO.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 登录信息
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Data
+@ApiModel(value = "登录信息")
+public class AutoLoginDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "用户名", required = true)
+    @NotBlank(message="{sysuser.username.require}")
+    private String username;
+
+    @ApiModelProperty(value = "密码")
+    @NotBlank(message="{sysuser.password.require}")
+    private String password;
+
+}

esua-epdc/epdc-cloud-commons-shibei

@@ -1 +1 @@
-Subproject commit 89bb48135eb0db7b1682b1e7d51b0bd5c8d02a0f
+Subproject commit ea7a11ae181a0b6b82775a6b7e859b4dbb3e550b

esua-epdc/epdc-cloud-gateway-shibei

@@ -1 +1 @@
-Subproject commit 4a4caf14c35de0d4678fd94d141da3661b549c1e
+Subproject commit fa2c20005c4b52aa606b2433c38ce51d3111ff9e

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java

@@ -125,4 +125,9 @@ public class ItemAppealPageResultDTO implements Serializable {
      */
     private String remainTime;
 
+    /**
+     * 流程最新状态
+     */
+    private String processState;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -4455,6 +4455,20 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             //保存处理节点
             handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_CHECK_APPLY.getValue());
             itemHandleProcessService.insert(handleProcessEntity);
+            // 删除已流转协助部门
+            itemDeptService.modifyItemDepts(deptId, formDTO.getId());
+            // 新增流转协助部门
+            ItemHandleSubmitFormDTO dto = ConvertUtils.sourceToTarget(formDTO, ItemHandleSubmitFormDTO.class);
+            // 手动拼接流转协助部门
+            ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO();
+            itemCirculationDeptResultDTO.setDeptId(dept.getData().getPid());
+            itemCirculationDeptResultDTO.setDeptName(dept.getData().getParentName());
+            itemCirculationDeptResultDTO.setSelected(false);
+            itemCirculationDeptResultDTO.setTypeKey(dept.getData().getTypeKey());
+            List<ItemCirculationDeptResultDTO> deptList = new ArrayList<>();
+            deptList.add(itemCirculationDeptResultDTO);
+            dto.setDeptResultDTOS(deptList);
+            itemDeptService.saveItemDepts(dto.getHandlerDeptId(), dto, handleProcessEntity.getId());
 
             //上报市平台
             pushToCityGridService.earlyInspection(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class));
@@ -4664,7 +4678,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
     }
 
-
     @Transactional(rollbackFor = Exception.class)
     public ItemHandleProcessDTO closedItem(AcceptPlantformProcessDTO formDto) {
         String successFlag = YesOrNoEnum.NO.value();
@@ -4771,7 +4784,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             return new Result().error("未查到相关项目，诉求ID：" + formDTO.getSqid());
         }
         process.setItemId(item.getId());
-        process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue());
+        process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_BH.getValue());
         process.setHandleAdvice(formDTO.getBhyy());
         process.setOutHandleAdvice(formDTO.getBhyy());
         process.setHandlerDept("青诉即办平台");
@@ -4794,7 +4807,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             return new Result().error("未查到相关项目，诉求ID：" + formDTO.getSqid());
         }
         process.setItemId(item.getId());
-        process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_DB.getValue());
+        process.setState(ItemGridPlatformHandleStatusEnum.HANDLE_QSJB_FK.getValue());
         process.setHandleAdvice(formDTO.getCljg());
         process.setOutHandleAdvice(formDTO.getCljg());
         process.setHandlerDept("青诉即办平台");

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -398,6 +398,7 @@
         <result property="handlerDeptId" column="HANDLER_DEPT_ID" />
         <result property="handlerDept" column="HANDLER_DEPT" />
         <result property="closeCheckId" column="CLOSE_CHECK_ID" />
+        <result property="evaluationState" column="EVALUATION_STATE" />
         <result property="handleAdviceRemark" column="HANDLE_ADVICE_REMARK" />
         <collection property="itemImges" ofType="java.lang.String">
             <result property="image" column="IMG_ITEM_URL"/>
@@ -2143,6 +2144,7 @@
                     when '2' then '非常满意'
                     else ''
                     end as evaluationScoreName,
+                process.state AS processState,
                 i.EVALUATION_CONTENT,
                 i.EVALUATION_TIME
         FROM epdc_item i