init: init project step4: biz code support

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -1505,10 +1505,11 @@ public class ApiController {
         }
 
         R<?> r = null;
+        String locationId = null;
         try {
             String temp32 = wmTaskContent.getTemp32();
             if (JSONUtil.isJsonArray(temp32)){
-
+                locationId = wmTaskContent.getTemp24();
                 JSONArray array = JSONUtil.parseArray(temp32);
 
                 AtomicInteger score = new AtomicInteger();
@@ -1556,6 +1557,13 @@ public class ApiController {
                     redisTemplate.delete(key);
                 });
             }
+
+            // 获取签到key
+            if (StrUtil.isNotBlank(locationId)){
+                String cacheKey = String.format("user:sign:temp:%s:%s", id, locationId);
+                redisTemplate.delete(cacheKey);
+            }
+
         }
 
         return r;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/CnbgMobileServiceImpl.java

@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class CnbgMobileServiceImpl implements MobileService {
 
-    private final RedisTemplate<String, String> redisTemplate;
+    private final RedisTemplate<String, Object> redisTemplate;
 
     private final SysUserMapper userMapper;
 
@@ -111,7 +111,7 @@ public class CnbgMobileServiceImpl implements MobileService {
             return R.ok(Boolean.FALSE, "请联系管理员为您开通账号");
         }
 
-        if (CollUtil.isNotEmpty(userList)) {
+        if (CollUtil.isEmpty(userList)) {
             log.info("请联系管理员为您开通账号:{}", mobile);
             return R.ok(Boolean.FALSE, "请联系管理员为您开通账号");
         }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -140,6 +140,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
     private final SysDeptRechargeRecordMapper sysDeptRechargeRecordMapper;
     private final RedisTemplate<String, String> redisTemplate;
     private final WmPkgQuizRelationService pkgQuizRelationService;
+    private final WmDaDrugEntDrugtableService drugEntDrugtableService;
 
     @Override
     public List<WmScorePackage> listWmScorePackageAndTask(WmScorePackage wmScorePackage) {
@@ -581,7 +582,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
      * @return
      */
     @Override
-    public R getRelationScoreList(WmScorePackage wmScorePackage) {
+    public R<?> getRelationScoreList(WmScorePackage wmScorePackage) {
         long start = System.currentTimeMillis();
         SysDept relatedService = new SysDept();
         if (null != wmScorePackage.getRelatedService()) {
@@ -614,6 +615,15 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
                 wmScorePackage1.setTaskTypeList1(taskTypelist);
                 Set taskTypeSet = taskTypelist.stream().map(WmScoreTaskType::getTaskTypeId).collect(Collectors.toSet());
                 wmScorePackage1.setTaskTypeSet(taskTypeSet);
+
+                String[] drugtable = wmScorePackage1.getDrugtable();
+
+                if (ArrayUtil.isNotEmpty(drugtable)){
+                    List<WmDaDrugEntDrugtable> entDrugtables = drugEntDrugtableService.listByIds(Arrays.asList(drugtable));
+                    String[] array = entDrugtables.stream().map(WmDaDrugEntDrugtable::getDrugnameTy).toArray(String[]::new);
+                    wmScorePackage1.setDrugtableName(array);
+
+                }
             }
         }
 

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmDaAgentMapper.xml

@@ -339,13 +339,16 @@
     </select>
 
     <select id="selectWmDaAgentByDeptId" resultMap="wmDaAgentMap" parameterType="java.util.HashMap">
-        select d.id,d.gsmc,d.enable_flag
+        select d.id,
+        d.gsmc,
+        d.dept_id,
+        d.enable_flag
         from wm_da_agent d
         left join wm_relation r on r.down_id=d.dept_id
         left join wm_da_drug_ent o on r.up_id=o.dept_id
         where r.up_id = #{upId,jdbcType=INTEGER}
         UNION
-        select id,entname,enable_flag from wm_da_drug_ent where dept_id= #{deptId,jdbcType=INTEGER}
+        select id,entname,dept_id,enable_flag from wm_da_drug_ent where dept_id= #{deptId,jdbcType=INTEGER}
 
     </select>