Merge remote-tracking branch 'origin/2021-04-21_music_replace' into 2021-04-21_music_replace

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ReplacementInstrumentActivityDao.java

@@ -1,18 +1,19 @@
 package com.ym.mec.biz.dal.dao;
 
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatDto;
 import com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatHead;
 import com.ym.mec.biz.dal.entity.ReplacementInstrumentActivity;
 import com.ym.mec.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
 
 public interface ReplacementInstrumentActivityDao extends BaseDAO<Integer, ReplacementInstrumentActivity> {
 
 
-    ReplacementInstrumentActivity findByUserId(Integer userId);
+    ReplacementInstrumentActivity findByUserId(@Param("cooperationOrganId") Integer cooperationOrganId, @Param("userId")Integer userId);
 
     List<ReplacementInstrumentActivityStatDto> queryReplacements(Map<String, Object> params);
 

mec-biz/src/main/java/com/ym/mec/biz/service/ReplacementInstrumentActivityService.java

@@ -14,7 +14,7 @@ public interface ReplacementInstrumentActivityService extends BaseService<Intege
 
     Object add(ReplacementInstrumentActivity replacementInstrumentActivity);
 
-    ReplacementInstrumentActivity findByUserId(Integer userId);
+    ReplacementInstrumentActivity findByUserId(Integer cooperationOrganId, Integer userId);
 
     PageInfo<ReplacementInstrumentActivityStatDto> queryReplacementsStat(ReplacementInstrumentActivityQueryInfo queryInfo);
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ReplacementInstrumentActivityServiceImpl.java

@@ -22,11 +22,14 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+
 import org.apache.poi.ss.formula.functions.T;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+
 import com.ym.mec.biz.dal.dao.ReplacementInstrumentActivityDao;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -63,6 +66,9 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
     private SysUserCashAccountDetailService sysUserCashAccountDetailService;
     @Autowired
     private SysMessageService sysMessageService;
+    
+    @Autowired
+    private CooperationOrganService cooperationOrganService;
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -80,8 +86,16 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
         }
         replacementInstrumentActivity.setUserId(sysUser.getId());
         //如果用户是43分部，那么修改用户信息
+        if(sysUser.getOrganId() == 43){
+        	CooperationOrgan cooperationOrgan = cooperationOrganService.get(replacementInstrumentActivity.getCooperationOrganId());
+            if (cooperationOrgan != null) {
+            	sysUser.setOrganId(cooperationOrgan.getOrganId());
+            	sysUser.setUpdateTime(new Date());
+            	sysUserFeignService.updateSysUser(sysUser);
+            }
+        }
         //如果提交过调查问卷，那么覆盖之前的记录
-        ReplacementInstrumentActivity activity = replacementInstrumentActivityDao.findByUserId(sysUser.getId());
+        ReplacementInstrumentActivity activity = replacementInstrumentActivityDao.findByUserId(replacementInstrumentActivity.getCooperationOrganId(), sysUser.getId());
         if (activity != null) {
             //覆盖之前的数据
             replacementInstrumentActivity.setId(activity.getId());
@@ -93,8 +107,8 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
     }
 
     @Override
-    public ReplacementInstrumentActivity findByUserId(Integer userId) {
-        return replacementInstrumentActivityDao.findByUserId(userId);
+    public ReplacementInstrumentActivity findByUserId(Integer cooperationOrganId, Integer userId) {
+        return replacementInstrumentActivityDao.findByUserId(cooperationOrganId, userId);
     }
 
     @Override

mec-biz/src/main/resources/config/mybatis/ReplacementInstrumentActivityMapper.xml

@@ -120,7 +120,7 @@
     <select id="findByUserId" resultMap="ReplacementInstrumentActivity">
         SELECT *
         FROM replacement_instrument_activity
-        WHERE user_id_ = #{userId}
+        WHERE user_id_ = #{userId} and cooperation_organ_id_ = #{cooperationOrganId}
         LIMIT 1
     </select>
 
@@ -139,7 +139,7 @@
                 AND ri.specification_ = #{specification}
             </if>
             <if test="search!=null and search!=''">
-                AND (ria.mobile_no_ LIKE CONCAT('%', #{search}, '%') OR stu.username_ LIKE CONCAT('%', #{search}, '%'))
+                AND (ria.mobile_no_ LIKE CONCAT('%', #{search}, '%') OR ria.user_name_ LIKE CONCAT('%', #{search}, '%'))
             </if>
         </where>
     </sql>
@@ -150,12 +150,12 @@
         sub.name_ subject_name_,
         ria.user_name_,
         ria.mobile_no_,
+        ria.pay_status_,
         ri.brand_,
         ri.specification_
         FROM
         replacement_instrument_activity ria
         LEFT JOIN replacement_instrument ri ON ria.instruments_id_ = ri.id_
-        LEFT JOIN sys_user stu ON ria.user_id_ = stu.id_
         LEFT JOIN `subject` sub ON ria.subject_id_ = sub.id_
         <include refid="queryReplacementsCondition"/>
         ORDER BY ria.update_time_ DESC
@@ -168,7 +168,6 @@
         FROM
         replacement_instrument_activity ria
         LEFT JOIN replacement_instrument ri ON ria.instruments_id_ = ri.id_
-        LEFT JOIN sys_user stu ON ria.user_id_ = stu.id_
         LEFT JOIN `subject` sub ON ria.subject_id_ = sub.id_
         <include refid="queryReplacementsCondition"/>
     </select>

mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -19,7 +19,7 @@
         <result column="update_time_" property="updateTime"/>
         <result column="care_package_" property="carePackage"/>
         <result column="come_on_package_" property="comeOnPackage"/>
-        <result column="current_grade_num" property="currentGradeNum"/>
+        <result column="current_grade_num_" property="currentGradeNum"/>
         <result column="current_class_" property="currentClass"/>
     </resultMap>
 

mec-student/src/main/java/com/ym/mec/student/controller/ReplacementInstrumentActivityController.java

@@ -51,7 +51,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
         if (user == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        ReplacementInstrumentActivity replacementInstrumentActivity = replacementInstrumentActivityService.findByUserId(user.getId());
+        ReplacementInstrumentActivity replacementInstrumentActivity = replacementInstrumentActivityService.findByUserId(cooperationOrganId, user.getId());
         if (replacementInstrumentActivity == null) {
             Student student = studentService.get(user.getId());
             replacementInstrumentActivity = new ReplacementInstrumentActivity();

mec-web/src/main/java/com/ym/mec/web/controller/ReplacementInstrumentActivityController.java

@@ -64,21 +64,6 @@ public class ReplacementInstrumentActivityController extends BaseController {
     @ApiOperation(value = "统计信息查询")
     @GetMapping("/queryReplacementsStat")
     public HttpResponseResult<PageInfo<ReplacementInstrumentActivityStatDto>> queryReplacementsStat(ReplacementInstrumentActivityQueryInfo queryInfo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        Employee employee = employeeDao.get(sysUser.getId());
-        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
-            queryInfo.setOrganId(employee.getOrganIdList());
-        } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
-            return failed("用户所在分部异常");
-        } else {
-            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-            if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
-                return failed("非法请求");
-            }
-        }
         return succeed(replacementInstrumentActivityService.queryReplacementsStat(queryInfo));
     }