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

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ReplacementInstrumentActivityDao.java
#	mec-biz/src/main/resources/config/mybatis/ReplacementInstrumentActivityMapper.xml

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

@@ -1,13 +1,23 @@
 package com.ym.mec.biz.dal.dao;
 
+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);
 
+    List<ReplacementInstrumentActivityStatDto> queryReplacements(Map<String, Object> params);
+    int countReplacements(Map<String, Object> params);
+
+    ReplacementInstrumentActivityStatHead countReplacementsInfo(Integer cooperationOrganId);
+
     int openPay(@Param("cooperationOrganId") Integer cooperationOrganId);
-}
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ReplacementInstrumentActivityStatDto.java

@@ -0,0 +1,53 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.ReplacementInstrument;
+import com.ym.mec.biz.dal.entity.ReplacementInstrumentActivity;
+
+/**
+ * @Author Joburgess
+ * @Date 2021/4/18 0018
+ */
+public class ReplacementInstrumentActivityStatDto extends ReplacementInstrumentActivity {
+
+    private String subjectName;
+
+    private String studentName;
+
+    /** 品牌 */
+    private String brand;
+
+    /** 型号 */
+    private String specification;
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public String getSpecification() {
+        return specification;
+    }
+
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ReplacementInstrumentActivityStatHead.java

@@ -0,0 +1,50 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author Joburgess
+ * @Date 2021/4/19 0019
+ */
+public class ReplacementInstrumentActivityStatHead {
+
+    private String cooperationOrganName;
+
+    private BigDecimal surveyNum;
+
+    private BigDecimal replacementNum;
+
+    private BigDecimal replacementRate = new BigDecimal(0);
+
+    public String getCooperationOrganName() {
+        return cooperationOrganName;
+    }
+
+    public void setCooperationOrganName(String cooperationOrganName) {
+        this.cooperationOrganName = cooperationOrganName;
+    }
+
+    public BigDecimal getSurveyNum() {
+        return surveyNum;
+    }
+
+    public void setSurveyNum(BigDecimal surveyNum) {
+        this.surveyNum = surveyNum;
+    }
+
+    public BigDecimal getReplacementNum() {
+        return replacementNum;
+    }
+
+    public void setReplacementNum(BigDecimal replacementNum) {
+        this.replacementNum = replacementNum;
+    }
+
+    public BigDecimal getReplacementRate() {
+        return replacementRate;
+    }
+
+    public void setReplacementRate(BigDecimal replacementRate) {
+        this.replacementRate = replacementRate;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ReplacementInstrumentActivity.java

@@ -18,6 +18,9 @@ public class ReplacementInstrumentActivity {
 	
 	/**  */
 	private Integer userId;
+
+	/**  */
+	private Integer openFlag;
 	
 	/**  */
 	private String userName;
@@ -46,6 +49,14 @@ public class ReplacementInstrumentActivity {
 	/**  */
 	private java.util.Date updateTime;
 
+	public Integer getOpenFlag() {
+		return openFlag;
+	}
+
+	public void setOpenFlag(Integer openFlag) {
+		this.openFlag = openFlag;
+	}
+
 	public String getCooperationOrganName() {
 		return cooperationOrganName;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ReplacementInstrumentActivityQueryInfo.java

@@ -5,8 +5,24 @@ import com.ym.mec.common.page.QueryInfo;
 
 public class ReplacementInstrumentActivityQueryInfo extends QueryInfo {
 
+    private Integer cooperationOrganId;
+
     private String organId;
 
+    private String subjectId;
+
+    private String brand;
+
+    private String specification;
+
+    public Integer getCooperationOrganId() {
+        return cooperationOrganId;
+    }
+
+    public void setCooperationOrganId(Integer cooperationOrganId) {
+        this.cooperationOrganId = cooperationOrganId;
+    }
+
     public String getOrganId() {
         return organId;
     }
@@ -14,4 +30,28 @@ public class ReplacementInstrumentActivityQueryInfo extends QueryInfo {
     public void setOrganId(String organId) {
         this.organId = organId;
     }
+
+    public String getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(String subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public String getBrand() {
+        return brand;
+    }
+
+    public void setBrand(String brand) {
+        this.brand = brand;
+    }
+
+    public String getSpecification() {
+        return specification;
+    }
+
+    public void setSpecification(String specification) {
+        this.specification = specification;
+    }
 }

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

@@ -1,6 +1,11 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatDto;
 import com.ym.mec.biz.dal.entity.ReplacementInstrumentActivity;
+import com.ym.mec.biz.dal.page.ReplacementInstrumentActivityQueryInfo;
+import com.ym.mec.biz.dal.page.ReplacementInstrumentQueryInfo;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
 public interface ReplacementInstrumentActivityService extends BaseService<Integer, ReplacementInstrumentActivity> {
@@ -8,4 +13,6 @@ public interface ReplacementInstrumentActivityService extends BaseService<Intege
     Object add(ReplacementInstrumentActivity replacementInstrumentActivity);
 
     ReplacementInstrumentActivity findByUserId(Integer userId);
-}
+
+    PageInfo<ReplacementInstrumentActivityStatDto> queryReplacementsStat(ReplacementInstrumentActivityQueryInfo queryInfo);
+}

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

@@ -2416,7 +2416,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 }
             }
             if(queryInfo.getMusicGroupIds() == null || queryInfo.getMusicGroupIds().size() == 0){
-                return null;
+                return new PageInfo<MusicGroup>();
             }
         }
         musicGroupPageInfo = queryPage(queryInfo);

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

@@ -2,14 +2,30 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.CooperationOrganDao;
+import com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatDto;
+import com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatHead;
+import com.ym.mec.biz.dal.entity.CooperationOrgan;
+import com.ym.mec.biz.dal.page.ReplacementInstrumentActivityQueryInfo;
+import com.ym.mec.biz.dal.page.ReplacementInstrumentQueryInfo;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.util.collection.MapUtil;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.ym.mec.biz.dal.entity.ReplacementInstrumentActivity;
 import com.ym.mec.biz.service.ReplacementInstrumentActivityService;
 import com.ym.mec.biz.dal.dao.ReplacementInstrumentActivityDao;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<Integer, ReplacementInstrumentActivity> implements ReplacementInstrumentActivityService {
@@ -18,6 +34,8 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
 	private ReplacementInstrumentActivityDao replacementInstrumentActivityDao;
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
+	@Autowired
+	private CooperationOrganDao cooperationOrganDao;
 
 	@Override
 	public BaseDAO<Integer, ReplacementInstrumentActivity> getDAO() {
@@ -25,6 +43,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Object add(ReplacementInstrumentActivity replacementInstrumentActivity) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
@@ -48,4 +67,29 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
 	public ReplacementInstrumentActivity findByUserId(Integer userId) {
 		return replacementInstrumentActivityDao.findByUserId(userId);
 	}
-}
+
+	@Override
+	public PageInfo<ReplacementInstrumentActivityStatDto> queryReplacementsStat(ReplacementInstrumentActivityQueryInfo queryInfo) {
+		PageInfo<ReplacementInstrumentActivityStatDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<String, Object>();
+		MapUtil.populateMap(params, queryInfo);
+
+		int count = replacementInstrumentActivityDao.countReplacements(params);
+
+		if(queryInfo.getPage()==1){
+			ReplacementInstrumentActivityStatHead head = replacementInstrumentActivityDao.countReplacementsInfo(queryInfo.getCooperationOrganId());
+			CooperationOrgan cooperationOrgan = cooperationOrganDao.get(queryInfo.getCooperationOrganId());
+			head.setCooperationOrganName(cooperationOrgan.getName());
+			pageInfo.setStatInfo(head);
+		}
+
+		pageInfo.setTotal(count);
+		params.put("offset", pageInfo.getOffset());
+		List<ReplacementInstrumentActivityStatDto> dataList = replacementInstrumentActivityDao.queryReplacements(params);
+		if (!CollectionUtils.isEmpty(dataList)) {
+
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+	}
+}

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

@@ -17,10 +17,18 @@
 		<result column="subject_id_" property="subjectId" />
 		<result column="question_result_" property="questionResult" />
 		<result column="instruments_id_" property="instrumentsId" />
+		<result column="open_flag_" property="openFlag" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
-	
+
+	<resultMap id="ReplacementInstrumentActivityStatDto" type="com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatDto" extends="ReplacementInstrumentActivity">
+		<result property="subjectName" column="subject_name_"/>
+		<result property="studentName" column="student_name_"/>
+		<result property="brand" column="brand_"/>
+		<result property="specification" column="specification_"/>
+	</resultMap>
+
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="ReplacementInstrumentActivity" >
 		SELECT * FROM replacement_instrument_activity WHERE id_ = #{id} 
@@ -43,6 +51,9 @@
 		<if test="subjectId != null">
 		subject_id_ = #{subjectId},
 		</if>
+		<if test="openFlag != null">
+		open_flag_ = #{openFlag},
+		</if>
 		<if test="userId != null">
 		user_id_ = #{userId},
 		</if>
@@ -91,6 +102,66 @@
 		SELECT * FROM replacement_instrument_activity WHERE user_id_ = #{userId} LIMIT 1
 	</select>
 
+	<sql id="queryReplacementsCondition">
+		<where>
+			<if test="cooperationOrganId!=null">
+				AND ria.cooperation_organ_id_ = #{cooperationOrganId}
+			</if>
+			<if test="subjectId!=null">
+				AND ria.subject_id_ = #{subjectId}
+			</if>
+			<if test="brand!=null and brand!=''">
+				AND ri.brand_ = #{brand}
+			</if>
+			<if test="specification!=null and specification!=''">
+				AND ri.specification_ = #{specification}
+			</if>
+			<if test="search!=null and search!=''">
+				AND (ria.mobile_no_ LIKE CONCAT('%', #{search}, '%') OR stu.username_ LIKE CONCAT('%', #{search}, '%'))
+			</if>
+		</where>
+	</sql>
+
+	<select id="queryReplacements" resultMap="ReplacementInstrumentActivityStatDto">
+		SELECT
+			ria.subject_id_,
+			sub.name_ subject_name_,
+			stu.username_ student_name_,
+			ria.mobile_no_,
+			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
+		<include refid="global.limit"></include>
+	</select>
+
+	<select id="countReplacements" resultType="int">
+		SELECT
+			COUNT(ria.id_)
+		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>
+
+	<select id="countReplacementsInfo"
+			resultType="com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatHead">
+		SELECT
+			COUNT(DISTINCT ria.user_id_) surveyNum,
+			COUNT(DISTINCT IF(ria.instruments_id_ IS NOT NULL, ria.user_id_, NULL)) replacementNum,
+			TRUNCATE(COUNT(IF(ria.instruments_id_ IS NOT NULL, ria.user_id_, NULL))/COUNT(DISTINCT ria.user_id_)*100, 2) replacementRate
+		FROM
+			replacement_instrument_activity ria
+		WHERE ria.cooperation_organ_id_ = #{cooperationOrganId}
+	</select>
+
 	<update id="openPay" parameterType="integer">
 		UPDATE replacement_instrument_activity SET open_flag_ = 1 WHERE cooperation_organ_id_ = #{cooperationOrganId} AND open_flag_ = 0
 	</update>

mec-common/common-core/src/main/java/com/ym/mec/common/page/PageInfo.java

@@ -28,6 +28,9 @@ public class PageInfo<T> implements Serializable {
 	private int total = 0;
 	private int totalPage = 0;
 
+	//统计信息
+	private Object statInfo;
+
 	/**
 	 * 分页信息
 	 */
@@ -54,6 +57,14 @@ public class PageInfo<T> implements Serializable {
 		this.offset = (pageNo - 1) * limit;
 	}
 
+	public Object getStatInfo() {
+		return statInfo;
+	}
+
+	public void setStatInfo(Object statInfo) {
+		this.statInfo = statInfo;
+	}
+
 	/**
 	 * 是否还有上一页
 	 * @return

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

@@ -53,7 +53,9 @@ public class ReplacementInstrumentActivityController extends BaseController {
             replacementInstrumentActivity = new ReplacementInstrumentActivity();
             replacementInstrumentActivity.setUserId(user.getId());
             replacementInstrumentActivity.setClasses(student.getCurrentClass());
-            replacementInstrumentActivity.setGrade(student.getCurrentGradeNum().toString());
+            if(student.getCurrentGradeNum() != null){
+                replacementInstrumentActivity.setGrade(student.getCurrentGradeNum().toString());
+            }
             replacementInstrumentActivity.setCooperationOrganId(cooperationOrganId);
             replacementInstrumentActivity.setUserName(StringUtils.isEmpty(user.getUsername())?user.getRealName():user.getUsername());
             replacementInstrumentActivity.setMobileNo(user.getPhone());
@@ -66,7 +68,7 @@ public class ReplacementInstrumentActivityController extends BaseController {
                 replacementInstrumentActivity.setCooperationOrganName(cooperationOrgan.getName());
             }
         }
-        return replacementInstrumentActivity;
+        return succeed(replacementInstrumentActivity);
     }
 
     @ApiOperation(value = "修改调查问卷")

mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -34,7 +34,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 				.antMatchers("/task/**")
 				.hasIpAddress("0.0.0.0/0")
 				.antMatchers("/v2/api-docs", "/classGroup/highClassGroups", "/code/*", "/api/*", "/appVersionInfo/queryByPlatform", "/eduDegree/*",
-						"/uploadFile", "/eduContracts/queryProduceContract","/activity/doubleEleven2020Statis").permitAll().anyRequest().authenticated().and().httpBasic();
+						"/uploadFile", "/eduContracts/queryProduceContract","/activity/doubleEleven2020Statis", "/replacementInstrumentActivity/queryReplacementsStat").permitAll().anyRequest().authenticated().and().httpBasic();
 	}
 
 	@Override

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

@@ -3,11 +3,14 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
+import com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatDto;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.page.ManagerDownloadQueryInfo;
 import com.ym.mec.biz.dal.page.ReplacementInstrumentActivityQueryInfo;
 import com.ym.mec.biz.service.ReplacementInstrumentActivityService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -53,4 +56,25 @@ public class ReplacementInstrumentActivityController extends BaseController {
         }
         return succeed(replacementInstrumentActivityService.queryPage(queryInfo));
     }
+
+    @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));
+    }
 }