Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

fs-admin/src/main/java/com/fs/his/controller/FsArticleAuditController.java

@@ -1,9 +1,11 @@
 package com.fs.his.controller;
+import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.core.redis.RedisCache;
+import com.fs.common.enums.BusinessType;
 import com.fs.his.domain.FsArticle;
 import com.fs.his.param.FsArticleAuditParam;
 import com.fs.his.service.IFsArticleService;
@@ -60,7 +62,8 @@ public class FsArticleAuditController extends BaseController
      * **/
     @PreAuthorize("@ss.hasPermi('his:articleAudit:articleAudit')")
     @PostMapping("/audit")
-    public R audit(FsArticleAuditParam param){
+    @Log(title = "文章审核", businessType = BusinessType.GRANT, logParam = {"文章", "审核文章"})
+    public R audit(@RequestBody FsArticleAuditParam param){
         if(param.getArticleId() == null){
             return R.error("文章ID不能为空");
         }

fs-company-app/src/main/java/com/fs/app/controller/FsUserCourseVideoController.java

@@ -1,6 +1,7 @@
 package com.fs.app.controller;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fs.app.annotation.Login;
 import com.fs.app.config.ImageStorageConfig;
@@ -11,6 +12,7 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.service.ICompanyUserService;
+import com.fs.course.config.CourseConfig;
 import com.fs.course.domain.FsUserCoursePeriod;
 import com.fs.course.dto.BatchSendCourseDTO;
 import com.fs.course.dto.BatchUrgeCourseDTO;
@@ -31,6 +33,7 @@ import com.fs.im.service.IFsImMsgSendDetailService;
 import com.fs.im.service.IFsImMsgSendLogService;
 import com.fs.im.service.OpenIMService;
 import com.fs.im.vo.FsImMsgSendLogVO;
+import com.fs.system.service.ISysConfigService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -77,6 +80,11 @@ public class FsUserCourseVideoController extends AppBaseController {
     @Autowired
     private IFsImMsgSendLogService imMsgSendLogService;
 
+    @Autowired
+    private ISysConfigService configService;
+
+    private final String FANG_HUA_APP_ID = "wx503cf8ab31f83dd4";
+
     @Login
     @GetMapping("/pageList")
     @ApiOperation("课程分页列表")
@@ -348,4 +356,22 @@ public class FsUserCourseVideoController extends AppBaseController {
         return imMsgSendLogService.deleteFsImMsgSendLogAndDetail(logId);
     }
 
+    @ApiOperation("获取登录小程id值")
+    @GetMapping("/getLoginMiniAppId/{appId}")
+    public ResponseResult getLoginMiniAppId(@PathVariable String appId){
+        String json = configService.selectConfigByKey("course.config");
+        if(null == json || com.hc.openapi.tool.util.StringUtils.isBlank(json)){
+            ResponseResult.fail(500,"请先配置课程系统参数");
+        }
+        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+        //判断配置的appid是否为芳华惠选appid 如果配置了直接返回芳华惠选的appid
+        if(null != config && StringUtils.isNotBlank(config.getLoginMiniAppId())){
+            String loginMiniAppId = config.getLoginMiniAppId();
+            if(FANG_HUA_APP_ID.equals(loginMiniAppId)){
+                return ResponseResult.ok(FANG_HUA_APP_ID);
+            }
+        }
+        return ResponseResult.ok(appId);
+    }
+
 }

fs-company/src/main/resources/application.yml

@@ -4,11 +4,11 @@ server:
 spring:
   profiles:
 #    active: druid-fcky-test
-    active: druid-jnmy-test
+#    active: druid-jnmy-test
 #    active: druid-jzzx-test
 #    active: druid-hdt
 #    active: druid-sxjz
 #    active: druid-yzt
 #    active: druid-myhk
 #    active: druid-sft
-#    active: dev-yjb
+    active: dev-yjb

fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fs.app.taskService.SopLogsTaskService;
 import com.fs.common.utils.PubFun;
 import com.fs.common.utils.StringUtils;
+import com.fs.common.utils.date.DateUtil;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyMiniapp;
 import com.fs.company.domain.CompanyUser;
@@ -1018,13 +1019,14 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
 
                     String sortLink = createLinkByMiniApp(setting, logVo, sendTime, courseId, videoId,
                             qwUserId, companyUserId, companyId, externalId,isOfficial,sopLogs.getFsUserId(), isGroupChat ? groupChat.getChatId() : null);
-
+                    QwExternalContact qwExternalContact = qwExternalContactMapper.selectById(externalId);
+                    LocalDateTime createTime = qwExternalContact.getCreateTime() == null ? LocalDateTime.now() : DateUtil.dateToLocalDateTime(qwExternalContact.getCreateTime());
                     if(sopLogs.getSendType()==1){
                         setting.setMiniprogramAppid(miniAppId);
                     }else {
                         int miniType = getLevel(grade);
                         //算主备小程序
-                        String finalAppId = getAppIdFromMiniMap(miniMap, companyId, sendMsgType, grade);
+                        String finalAppId = getAppIdFromMiniMap(miniMap, companyId, sendMsgType, grade, createTime);
 
                         if (StringUtil.strIsNullOrEmpty(finalAppId)) {
                             finalAppId = miniAppId;
@@ -1099,7 +1101,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
     private String getAppIdFromMiniMap(Map<Long, Map<Integer, List<CompanyMiniapp>>> miniMap,
                                        String companyId,
                                        int sendMsgType,
-                                       Integer grade) {
+                                       Integer grade, LocalDateTime createTime) {
         if (miniMap.isEmpty() || sendMsgType != 1) {
             return null;
         }
@@ -1108,8 +1110,14 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         if (gradeMap == null) {
             return null;
         }
-
-        int listIndex = getLevel(grade);
+        LocalDateTime lastTime = LocalDateTime.of(2025, 11, 6, 23, 59, 59);
+//        if (createTime.isAfter(lastTime)) {
+//            System.out.println("创建时间大于目标时间");
+//        } else {
+//            System.out.println("创建时间不大于目标时间");
+//        }
+//        int listIndex = getLevel(grade);
+        int listIndex = createTime.isAfter(lastTime) ? 1 : 0 ;
         List<CompanyMiniapp> miniapps = gradeMap.get(listIndex);
 
         if (miniapps == null || miniapps.isEmpty()) {

fs-service/src/main/java/com/fs/course/config/CourseConfig.java

@@ -85,6 +85,11 @@ public class CourseConfig implements Serializable {
      */
     private Boolean isOpenIM;
 
+    /**
+     * 用于配置登录的小程序id
+     */
+    private String loginMiniAppId;
+
 
     @Data
     public static class DisabledTimeVo{

fs-service/src/main/java/com/fs/his/service/impl/FsArticleServiceImpl.java

@@ -134,7 +134,7 @@ public class FsArticleServiceImpl implements IFsArticleService
         }
 
 
-        if(fsArticle.getAuditStatus() < -1 && param.getAuditStatus() > 2){
+        if(param.getAuditStatus() < -1 && param.getAuditStatus() > 2){
             return R.error("操作失败，审核状态异常！");
         }
 
@@ -148,6 +148,8 @@ public class FsArticleServiceImpl implements IFsArticleService
 
         //插入日志信息
         storeAuditLogUtil.addAudit(param.getArticleId(), param.getReason(), param.getAttachImage());
-        return R.ok("操作成功");
+        StringBuilder auditLog = new StringBuilder();
+        auditLog.append("文章审核标题：").append(fsArticle.getTitle()).append("，审核状态：").append(param.getAuditStatus() == -1 ? "驳回" : "审核通过").append("，审核结果：").append(param.getReason());
+        return R.ok(auditLog);
     }
 }

fs-service/src/main/java/com/fs/his/vo/FsArticleListVO.java

@@ -56,4 +56,10 @@ public class FsArticleListVO {
     /** 更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+
+
+    /**
+     * 是否审核（-1驳回、0待审核,1审核中、2已审核）
+     * **/
+    private Integer auditStatus;
 }

fs-service/src/main/java/com/fs/qw/mapper/QwExternalContactMapper.java

@@ -48,7 +48,7 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
 
     public List<QwExternalContact> selectQwExternalContactByIds(@Param("ids") List<Long> ids);
 
-    @Select("SELECT id,stage_status,name,fs_user_id from qw_external_contact where id=#{id}")
+    @Select("SELECT * from qw_external_contact where id=#{id}")
     public QwExternalContact selectQwExternalContactByIdForStageStatus(@Param("id") Long id);
 
     @Select("SELECT\n" +

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -928,8 +928,10 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
 
                             String miniAppId = null;
 
-                            int effectiveGrade = (item.getGrade() == null) ? 5 : item.getGrade();
-                            int listIndex = (effectiveGrade == 1 || effectiveGrade == 2) ? 0 : 1;
+                            LocalDateTime lastTime = LocalDateTime.of(2025, 11, 6, 23, 59, 59);
+                            int listIndex = contact == null || contact.getCreateTime() == null ? 1 : DateUtil.dateToLocalDateTime(contact.getCreateTime()).isAfter(lastTime) ? 1 : 0 ;
+//                            int effectiveGrade = (item.getGrade() == null) ? 5 : item.getGrade();
+//                            int listIndex = (effectiveGrade == 1 || effectiveGrade == 2) ? 0 : 1;
                             if (!miniMap.isEmpty() && qwUser.getSendMsgType() == 1) {
                                 Map<Integer, List<CompanyMiniapp>> integerListMap = miniMap.get(Long.valueOf(companyId));
                                 if (integerListMap != null) {

fs-service/src/main/resources/mapper/his/FsArticleMapper.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsArticleVo">
-        select article_id, cate_id, title, image_url, is_tui, is_news, contents, views, sort, create_time, update_time, publish_time from fs_article
+        select article_id, cate_id, title, image_url, is_tui, is_news, contents, views, sort, create_time, update_time, publish_time, audit_status from fs_article
     </sql>
 
     <select id="selectFsArticleList" parameterType="FsArticle" resultMap="FsArticleResult">