Merge remote-tracking branch '99/dev' into 99dev

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/UserServiceImpl.java

@@ -31,8 +31,18 @@ public class UserServiceImpl implements IUserService {
         return systemClient.getUserlist(user);
     }
 
-    public  List<UserVo> getUser(SelectUserVo vo){
+    public List<UserVo> getUser(SelectUserVo vo) {
-        return new ArrayList<>();
+        BaseResponse<List<SysUser>> userlist = systemClient.getUserlist(new SysUser());
+        List<UserVo> list = new ArrayList<>();
+        userlist.getData().forEach(user1 -> {
+            UserVo userVo = new UserVo();
+            userVo.setUserId(user1.getUserId());
+            userVo.setUserName(user1.getName());
+            userVo.setUserDept(user1.getOrgName());
+            userVo.setUserDeptId(user1.getOrgId());
+            list.add(userVo);
+        });
+        return list;
     }
 
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/config/SecurityConfig.java

@@ -0,0 +1,23 @@
+package com.chinaunicom.zyhy.ebtp.supplier.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+
+        http
+                .authorizeRequests()
+                .anyRequest().permitAll()
+                .and()
+                .csrf().disable();
+    }
+}
+

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskSupplierUserServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
 import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
 import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant;
-import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewScoringMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTaskMapper;
 import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTaskSupplierUserMapper;
@@ -63,9 +62,18 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
         vo.setId(id);
         vo.setName(baseCategoryNameVo.getName());
         BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        //TODO 待完善，部门名称
         vo.setDeptName(currentUser.getOrganizationId());
-        vo.setThemName(coscoAnnualreviewTask.getAnnualreviewTheme());
+        vo.setAnnualreviewTheme(coscoAnnualreviewTask.getAnnualreviewTheme());
         vo.setReviewerName(currentUser.getUserId());
+
+        if(coscoAnnualreviewTaskSupplierUser.getReviewStatus().equals(AnnualreviewTaskConstant.WAIT_APPROVE)){
+            vo.setReviewStatusName("待评审");
+        }
+        if(coscoAnnualreviewTaskSupplierUser.getReviewStatus().equals(AnnualreviewTaskConstant.APPROVE_PASS)){
+            vo.setReviewStatusName("已评审");
+        }
+
         vo.setStartTime(coscoAnnualreviewTask.getStartTime());
         vo.setEndTime(coscoAnnualreviewTask.getEndTime());
         vo.setCategory(baseCategoryNameVo.getCategoryName());
@@ -141,12 +149,13 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
         IPage<AnnualreviewTaskSupplierUserVo> p = new Page<>(userVo.getBasePageRequest().getPageNo(),
                 userVo.getBasePageRequest().getPageSize());
         IPage<AnnualreviewTaskSupplierUserVo> annualreviewTaskSupplierUserVoIPage = coscoAnnualreviewTaskSupplierUserMapper.selectPage(p, userVo);
+        //TODO 待完善，部门名称
         List<String> deptIds = new ArrayList<>();
         annualreviewTaskSupplierUserVoIPage.getRecords().forEach(vo -> {
             deptIds.add(vo.getDeptId());
         });
-        //发起单位查询
+        //TODO 发起单位查询
-        //添加发起单位
+        //TODO 添加发起单位
         return annualreviewTaskSupplierUserVoIPage;
     }
 

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/vo/AnnualreviewTaskSupplierUserInfoVo.java

@@ -1,6 +1,5 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo;
 
-import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -24,7 +23,7 @@ public class AnnualreviewTaskSupplierUserInfoVo implements Serializable {
     /**
      * 审查主题
      */
-    private String themName;
+    private String annualreviewTheme;
     /**
      * 所属部门
      */
@@ -33,6 +32,10 @@ public class AnnualreviewTaskSupplierUserInfoVo implements Serializable {
      * 审查人
      */
     private String reviewerName;
+    /**
+     * 审查状态
+     */
+    private String reviewStatusName;
     /**
      * 开始时间
      */

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java

@@ -97,7 +97,7 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
         listVo.setCreateBy(currentUser.getUserId());
         listVo.setLastUpdateTime(LocalDateTime.now());
         listVo.setDelFlag(CoscoCategoryConstant.DELETE_FLAG_YES);
-        listVo.setDeptId(currentUser.getDeptId());
+        listVo.setDeptId(currentUser.getOrganizationId());
         listVo.setId(PropertyUtils.getSnowflakeId());
         coscoBlacklistMapper.insertCoscoBlacklist(listVo);
         //添加供应商

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java

@@ -81,7 +81,7 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
         coscoCategoryLibrary.setCreateTime(LocalDateTime.now());
         coscoCategoryLibrary.setCreateBy(currentUser.getUserId());
         coscoCategoryLibrary.setDelFlag(CoscoCategoryConstant.DELETE_FLAG_YES);
-        coscoCategoryLibrary.setApplyDeptId(currentUser.getDeptId());
+        coscoCategoryLibrary.setApplyDeptId(currentUser.getOrganizationId());
         coscoCategoryLibrary.setId(PropertyUtils.getSnowflakeId());
         if (coscoCategoryLibrary.getApproveType().equals(CoscoCategoryConstant.BUILD_TYPE_OFFLINE)) {
             coscoCategoryLibrary.setApproveStatus(CoscoCategoryConstant.APPROVE_STATUS_PASS);

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java

@@ -142,14 +142,14 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
          */
         List<String> deptIds = new ArrayList<>();
         BaseCacheUser currentUser = TokenUtil.getCurrentUser();
-        BaseResponse<SysOrg> orgInfo = systemClient.getOrgInfo(currentUser.getDeptId());
+        BaseResponse<SysOrg> orgInfo = systemClient.getOrgInfo(currentUser.getOrganizationId());
         if (orgInfo.isSuccess()) {
             SysOrg data = orgInfo.getData();
             String orgFullId = data.getOrgFullId();
             String[] split = orgFullId.split(",");
             List<String> split1 = new ArrayList<>();
             for (String s : split) {
-                if(!currentUser.getDeptId().equals(s)){
+                if(!currentUser.getOrganizationId().equals(s)){
                     split1.add(s);
                 }
             }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/controller/ScheduledTasksController.java

@@ -14,7 +14,7 @@ public class ScheduledTasksController {
 
     @RequestMapping()
     public void checkTask() {
-        scheduledTasksService.closeTask();
+        scheduledTasksService.checkTask();
     }
 
 

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ScheduledTasksService.java

@@ -1,6 +1,10 @@
 package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service;
 
-public interface ScheduledTasksService {
+import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.NoTaskVo;
 
+import java.util.List;
+
+public interface ScheduledTasksService {
+    List<NoTaskVo> checkTask();
     void closeTask();
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskAssignDeptServiceImpl.java

@@ -100,7 +100,7 @@ public class CoscoEvaluateTaskAssignDeptServiceImpl implements ICoscoEvaluateTas
         CoscoEvaluateTaskAssignDept dept = new CoscoEvaluateTaskAssignDept();
         dept.setEvaluateTaskId(addCoscoEvaluateTaskVo.getId());
         BaseCacheUser currentUser = TokenUtil.getCurrentUser();
-        dept.setParentDeptId(currentUser.getDeptId());
+        dept.setParentDeptId(currentUser.getOrganizationId());
         //获取是否已经拥有权限，如果拥有权限不添加
         List<CoscoEvaluateTaskAssignDept> coscoEvaluateTaskAssignDepts = coscoEvaluateTaskAssignDeptMapper.selectCoscoEvaluateTaskAssignDeptList(dept);
         //如果没有权限添加

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java

@@ -261,7 +261,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
         List<String> taskIds = coscoEvaluateTaskListVoIPage.getRecords().stream().map(CoscoEvaluateTaskListVo::getId).collect(Collectors.toList());
         //获取本部门id
         BaseCacheUser currentUser = TokenUtil.getCurrentUser();
-        taskListVo.setDeptId(currentUser.getDeptId());
+        taskListVo.setDeptId(currentUser.getOrganizationId());
         taskListVo.setTaskIds(taskIds);
         //获取上级部门id
         taskListVo.setParentDeptId(SupplierUserConstant.PARENT_DEPT_ID);
@@ -271,7 +271,9 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
         Map<String, String> map = vos.stream().collect(Collectors.toMap(DivisionVo::getTaskId, DivisionVo::getDivision));
         //根据分工参数赋值
         coscoEvaluateTaskListVoIPage.getRecords().forEach(task -> {
-            task.setIsEditor(task.getDeptId().equals(taskListVo.getDeptId()) ? "1" : "0"); //1表示可修改 0不可修改
+            if(task.getDeptId()!=null){
+                task.setIsEditor(task.getDeptId().equals(taskListVo.getDeptId()) ? "1" : "0"); //1表示可修改 0不可修改
+            }
             task.setDivision(map.get(task.getId()) == null ? "2" : map.get(task.getId())); //2表示未分工 1表示已分工
         });
         return coscoEvaluateTaskListVoIPage;
@@ -346,7 +348,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
     @Override
     public int incrementalDivisionOfLaborAdditionAdd(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) {
         BaseCacheUser currentUser = TokenUtil.getCurrentUser();
-        addCoscoEvaluateTaskVo.setDeptId(currentUser.getDeptId());
+        addCoscoEvaluateTaskVo.setDeptId(currentUser.getOrganizationId());
         deleteAll(addCoscoEvaluateTaskVo);
         addEvalTaskInfo(addCoscoEvaluateTaskVo);
         return 1;
@@ -497,7 +499,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
         addCoscoEvaluateTaskVo.setId(PropertyUtils.getSnowflakeId());
         addCoscoEvaluateTaskVo.setCreateBy(currentUser.getUserId());
         addCoscoEvaluateTaskVo.setUpdateBy(currentUser.getUserId());
-        addCoscoEvaluateTaskVo.setDeptId(currentUser.getDeptId());
+        addCoscoEvaluateTaskVo.setDeptId(currentUser.getOrganizationId());
         coscoEvaluateTaskMapper.insertCoscoEvaluateTask(addCoscoEvaluateTaskVo);
     }
 

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 供应商维度评价
@@ -55,6 +56,10 @@ public class SupplierDimensionVo implements Serializable {
      * 提交状态名称
      */
     private String reviewStatusName;
+    /**
+     * 提交时间
+     */
+    private Date reviewTime;
 
     /**
      * 人员id

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoBlack/dao/mapper/CoscoBlacklistMapper.xml

@@ -228,7 +228,7 @@
 	)
                                          as themeName
         FROM cosco_blacklist cb
-        where cb.del_falg = 'normal'
+        where cb.del_flag = 'normal'
         order by cb.create_time desc
     </select>
 

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml

@@ -221,7 +221,7 @@
         ccl.remark,
         CASE
         WHEN ccl.approve_status = 0 AND ccl.work_flow_id IS NULL THEN '未开始'
-        WHEN ccl.approve_status = 0 AND ccl.work_flow_id IS NOT NULL THEN '进行中'
+        WHEN ccl.approve_status = 3 THEN '进行中'
         ELSE '已结束'
         END AS approveStatusName,
         CASE

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml

@@ -186,7 +186,7 @@
 
         select cclsa.id, ccl.name,ccl.area,'张三' as applyUser ,
                ccl.create_time as applyTime,cclsa.approve_status as approveStatus,
-               case when cclsa.approve_status=0 then '未开始'
+               case when cclsa.approve_status=0 and cclsa.work_flow_id is  null then '未开始'
                     when cclsa.approve_status=0 and cclsa.work_flow_id is not null then '进行中'
                     else '已结束'
                    end as processStatusName,

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryMapper.xml

@@ -87,11 +87,13 @@
 
             </if>
         </where>
+        order by cc.order_by asc
     </select>
 
     <select id="selectMyPage" parameterType="object"
             resultMap="CoscoCategoryResult">
         <include refid="selectCoscoCategoryVo"/>
+        order by order_by asc
     </select>
 
     <select id="selectCoscoCategoryById" parameterType="String"

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml

@@ -289,6 +289,7 @@
         cet.STATUS ,
         cet.dept_id as deptId,
         cetsu.review_status reviewStatus,
+        cetsu.review_time reviewTime,
         case when cet.STATUS=0 then '未开始'
         when cet.status =1 then '进行中'
         when cet.status =2 then '已结束' end as statusName,