修改配置文件

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

@@ -273,7 +273,11 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
             }
         }
         SysOrg sysOrg = orgService.getOrgInfo(coscoCategoryLibrary.getApplyDeptId());
-        vo.setDeptName(sysOrg.getOrgName());
+        vo.setApplyDeptName(sysOrg.getOrgName());
+        vo.setApplyOrgName(sysOrg.getCuCompanyName());
+        SysOrg orgName = orgService.getOrgInfo(coscoCategoryLibrary.getDeptId());
+        vo.setDeptName(orgName.getOrgName());
+        vo.setOrgName(orgName.getCuCompanyName());
         vo.setCategoryName(sb.toString());
         vo.setCategoryPathName(categoryPathNames.toString());
         vo.setCoscoCategoryLibrarAttachments(coscoCategoryLibrarAttachmentsService.selectCoscoCategoryLibrarAttachmentsByCategoryLibraryId(id));

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryDetailVo.java

@@ -14,6 +14,12 @@ public class CoscoCategoryLibraryDetailVo extends CoscoCategoryLibrary {
 
     private String deptName;
 
+    private String applyDeptName;
+
+    private String applyOrgName;
+
+    private String orgName;
+
     private String createByName;
 
     private String categoryName;

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoAccessWorkController.java

@@ -15,6 +15,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoAccessWorkVo;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -40,7 +41,9 @@ public class CoscoAccessWorkController extends BaseController {
     public BaseResponse<IPage<CoscoAccessWork>> getPage(@ApiParam(value = "对象数据", required = true) @RequestBody CoscoAccessWork data) {
         //判断当前登录人是否是组长
         BaseCacheUser currentUser = TokenUtil.getCurrentUser();
-        data.setOrgId(currentUser.getOrganizationId());
+        if(StringUtils.isEmpty(data.getOrgId())){
+            data.setOrgId(currentUser.getOrganizationId());
+        }
         return BaseResponse.success(coscoAccessWorkService.getPage(data));
     }
 

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java

@@ -47,6 +47,8 @@ public class CoscoMessageController extends BaseController {
         if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){
             CoscoSupplierUser coscoSupplierUser =  coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId());
             coscoMessage.setReceiverId(coscoSupplierUser.getSupplierId());
+        }else{
+            coscoMessage.setReceiverId(currentUser.getUserId());
         }
         return BaseResponse.success(coscoMessageService.getPage(coscoMessage));
     }
@@ -59,7 +61,7 @@ public class CoscoMessageController extends BaseController {
     }
 
     /**
-     * 获取这个登录的供应商所有未读品类退出消息
+     * 获取这个登录的供应商所有未读品类退出消息--(暂时只有供应商能用上)
      * @return
      */
     @ApiOperation("查询数据")
@@ -78,6 +80,30 @@ public class CoscoMessageController extends BaseController {
     }
 
 
+    /**
+     * 获取当前登录人所有未读消息
+     * @return
+     */
+    @ApiOperation("查询数据")
+    @GetMapping("/getCountMessage")
+    public BaseResponse getCountMessage() {
+        BaseCacheUser currentUser = TokenUtil.getCurrentUser();
+        CoscoMessage coscoMessage = new CoscoMessage();
+        coscoMessage.setRead(0l);//未读
+        //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情
+        if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){
+            CoscoSupplierUser coscoSupplierUser =  coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId());
+            coscoMessage.setReceiverId(coscoSupplierUser.getSupplierId());
+        }else{
+            coscoMessage.setReceiverId(currentUser.getUserId());
+        }
+        return BaseResponse.success(coscoMessageService.getCountMessage(coscoMessage));
+    }
+
+
+
+
+
     /**
      * 批量修改已读状态----暂时没用
      * @param ids

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/dao/mapper/CoscoMessageMapper.java

@@ -31,6 +31,9 @@ public interface CoscoMessageMapper {
     List<CoscoMessage> selectCoscoMessageList(CoscoMessage vo);
 
 
+    String selectCountMessage(CoscoMessage vo);
+
+
     /**
      * 新增供应商业务处理消息推送
      *

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/entity/CoscoAccessUser.java

@@ -57,9 +57,16 @@ public class CoscoAccessUser extends CoscoBaseEntity {
      */
     private String deptName;
 
+    /**
+     * 单位名称
+     */
+    private String orgName;
+
     /**
      * 人员名称
      */
     private String userName;
 
+
+
 }

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/ICoscoMessageService.java

@@ -21,6 +21,8 @@ public interface ICoscoMessageService {
 
     List<CoscoMessage> getExitMge(CoscoMessage data);
 
+    String getCountMessage(CoscoMessage data);
+
     /**
      * 查询供应商业务处理消息推送
      *

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java

@@ -164,6 +164,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
         CoscoAccessWork coscoAccessWork = coscoAccessWorkMapper.selectCoscoAccessWorkById(id);
         SysOrg org = orgService.getOrgInfo(coscoAccessWork.getDeptId());
         coscoAccessWork.setDeptName(org.getOrgName());
+        coscoAccessWork.setOrgName(org.getCuCompanyName());
         vo.setCoscoAccessWork(coscoAccessWork);
 
         //供应商信息

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java

@@ -190,6 +190,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
         CoscoAccessWork coscoAccessWork = coscoAccessWorkMapper.selectCoscoAccessWorkById(id);
         SysOrg dept = orgService.getOrgInfo(coscoAccessWork.getDeptId());
         coscoAccessWork.setDeptName(dept.getOrgName());//准入部门
+        coscoAccessWork.setOrgName(dept.getCuCompanyName());//准入单位
         vo.setCoscoAccessWork(coscoAccessWork);
 
         //供应商信息
@@ -224,6 +225,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
                 if (deptId != null && orgMap.containsKey(deptId)) {
                     SysOrg org = orgMap.get(deptId);
                     accessUser.setDeptName(org.getOrgName());
+                    accessUser.setOrgName(org.getCuCompanyName());// 设置单位名称
                 }
 
 

src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoMessageServiceImpl.java

@@ -53,6 +53,11 @@ public class CoscoMessageServiceImpl implements ICoscoMessageService {
         return coscoMessageList;
     }
 
+    @Override
+    public String getCountMessage(CoscoMessage data) {
+        return coscoMessageMapper.selectCountMessage(data);
+    }
+
     /**
      * 查询供应商业务处理消息推送
      *

src/main/resources/application-dev.yml

@@ -35,6 +35,7 @@ spring:
     nacos:
       discovery:
         server-addr: 10.0.0.125:8848
+        namespace: EBTP_GROUP
   aop:
     auto: true #开启spring的aop配置
     proxy-target-class: true
@@ -52,6 +53,10 @@ spring:
         password: Unicom@2024
         jdbc-url: jdbc:mysql://59.110.10.99:53306/cosco_supplier_manager?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
         url: jdbc:mysql://59.110.10.99:53306/cosco_supplier_manager?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+#        username: dev
+#        password: dev
+#        jdbc-url: jdbc:mysql://10.0.0.19:3308/cosco_supplier_manager?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+#        url: jdbc:mysql://10.0.0.19:3308/cosco_supplier_manager?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
         filters: stat,wall,log4j
         maxActive: 20
         initialSize: 1
@@ -101,9 +106,9 @@ spring:
 
   # 天宫 redis 需要使用哨兵进行访问
   redis:
-    sentinel:
-      master: mymaster
-      nodes: 10.0.0.125:6379
+#    sentinel:
+#      master: mymaster
+#      nodes: 10.0.0.125:6379
     password:
     database:
       sharding: 1

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskSupplierMapper.xml

@@ -290,7 +290,7 @@
             <if test="vo.orgId!=null and vo.orgId!=''">
                 and cat.org_id = #{vo.orgId}
             </if>
-            and cat.level_name is not null
+            and cats.review_result is not null
         </where>
 
         order by cats.create_time desc

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

@@ -29,6 +29,7 @@
         select id,
                name,
                apply_dept_id,
+               apply_org_id,
                approve_type,
                org_id,
                term_of_validity,

src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoAccessWorkMapper.xml

@@ -65,12 +65,6 @@
                 WHEN w.review_status = 3 THEN '已完成'
                 ELSE CAST(w.review_status AS CHAR)
                 END AS review_status_text,
-            CASE
-                WHEN w.approve_status = 0 THEN '审批中'
-                WHEN w.approve_status = 1 THEN '通过'
-                WHEN w.approve_status = 2 THEN '驳回'
-                ELSE CAST(w.approve_status AS CHAR)
-                END AS approve_status_text,
             w.work_flow_id,
             w.create_by,
             w.create_time,
@@ -108,12 +102,6 @@
                WHEN w.review_status = 3 THEN '已完成'
                ELSE CAST(w.review_status AS CHAR)
                END AS review_status_text,
-           CASE
-               WHEN w.approve_status = 0 THEN '审批中'
-               WHEN w.approve_status = 1 THEN '通过'
-               WHEN w.approve_status = 2 THEN '驳回'
-               ELSE CAST(w.approve_status AS CHAR)
-               END AS approve_status_text,
            w.work_flow_id,
            w.create_by,
            w.create_time,

src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoMessageMapper.xml

@@ -64,6 +64,25 @@
         </where>
     </select>
 
+
+    <select id="selectCountMessage" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoMessage" resultType="String">
+        SELECT
+           count(0)
+        FROM
+        cosco_message m
+        <where>
+            <if test="receiverId != null  and receiverId != ''">
+                and m.receiver_id = #{receiverId}
+            </if>
+            <if test="read != null ">
+                and m.`read` = #{read}
+            </if>
+            <if test="type != null  and type != ''">
+                and m.type = #{type}
+            </if>
+        </where>
+    </select>
+
     <select id="selectCoscoMessageById" parameterType="String"
             resultMap="CoscoMessageResult">
             <include refid="selectCoscoMessageVo"/>

src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierChangeApplyMapper.xml

@@ -66,14 +66,6 @@
             c.change_by,
             c.change_time,
             c.approve_status,
-            CASE
-                WHEN c.approve_status = 0 THEN
-                    '审批中'
-                WHEN c.approve_status = 1 THEN
-                    '通过'
-                WHEN c.approve_status = 2 THEN
-                    '驳回' ELSE CAST( c.approve_status AS CHAR )
-                END AS approve_status_text,
             c.work_flow_id,
             c.del_flag,
             c.create_time,
@@ -132,15 +124,6 @@
         c.change_by,
         c.change_time,
         c.approve_status,
-        CASE
-
-        WHEN c.approve_status = 0 THEN
-        '待审批'
-        WHEN c.approve_status = 1 THEN
-        '通过'
-        WHEN c.approve_status = 2 THEN
-        '驳回' ELSE CAST( c.approve_status AS CHAR )
-        END AS approve_status_text,
         c.work_flow_id,
         c.create_time,
         wo.maxTime as update_time