Merge branch 'feature/bssb_screen' 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.LoginDTO;
-import com.elink.esua.epdc.dto.SysUserAnalysisOpenIdFormDTO;
-import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO;
+import com.elink.esua.epdc.dto.*;
 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);
+        }
+
+        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-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

@@ -4773,7 +4773,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("青诉即办平台");
@@ -4796,7 +4796,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

@@ -2143,6 +2143,7 @@
                     when '2' then '非常满意'
                     else ''
                     end as evaluationScoreName,
+                process.state AS processState,
                 i.EVALUATION_CONTENT,
                 i.EVALUATION_TIME
         FROM epdc_item i