submit

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/poi/EasyPoiUtil.java

@@ -166,7 +166,7 @@ public class EasyPoiUtil {
         } catch (NoSuchElementException e) {
             throw new RuntimeException("excel文件不能为空");
         } catch (Exception e) {
-            throw new RuntimeException(e.getMessage());
+            throw new RuntimeException("导入的文件不正确，请重新导入！");
 
         }
         return list;

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -1755,13 +1755,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         customerBos.forEach(item -> {
             if (StringUtils.isBlank(item.getUserCard())){
-                return;
+                throw new CustomException("身份证号码不能为空！");
             }
             User user = getOne(new LambdaQueryWrapper<User>()
                     .eq(User::getIdCard, EncryptHandler.encrypt(item.getUserCard()))
                     .eq(User::getStatus, 1));
             if (Objects.isNull(user)){
-                return;
+                throw new CustomException("用户获取失败，请检查身份证号码！");
             }
 
             //跟新用户资料

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserQueryBo.java

@@ -220,4 +220,10 @@ public class UserQueryBo extends BaseEntity {
 	private Long educationTypeId;
 	private Long projectId;
 	private Long majorId;
+
+	@ApiModelProperty("承诺书上传：1是 0否")
+	private Integer promiseUploadSign;
+
+	@ApiModelProperty("承诺书签名：1是 0否")
+	private Integer promiseSign;
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -2068,9 +2068,12 @@
             AND m.id = #{majorId}
         </if>
         <if test="goodsName != null and goodsName !='' ">
-            AND g.goods_name = #{goodsName}
+            AND g.goods_name like concat('%', #{goodsName}, '%'))
         </if>
-        <if test="subscribeStatus != null and subscribeStatus != 3">
+        <if test="subscribeStatus != null and subscribeStatus != 1">
+            AND us.subscribe_status = 1 AND (TIME_TO_SEC(us.apply_site_end_time) + us.apply_site_exam_time) &gt; UNIX_TIMESTAMP()
+        </if>
+        <if test="subscribeStatus != null and subscribeStatus == 2">
             AND us.subscribe_status = #{subscribeStatus}
         </if>
         <if test="subscribeStatus != null and subscribeStatus == 3">

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -728,6 +728,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN order_goods og ON o.order_sn = og.order_sn
             LEFT JOIN goods g ON og.goods_id = g.goods_id WHERE o.`status` = 1 AND o.user_id = u.user_id AND og.pay_status IN ( 2, 3, 4 )  AND og.refund_status != 2 AND g.business_id = #{businessId})>0
         </if>
+        <if test="promiseUploadSign != null promiseUploadSign == 1" >
+            AND (SELECT COUNT(up.id) FROM user_profile up WHERE up.user_id = u.user_id AND up.current_status = 1
+            AND INSTR(up.key_value,'"fieldKey":"commitment_seal","value":"oss/images/avatar') > 0) > 0
+        </if>
+        <if test="promiseUploadSign != null promiseUploadSign == 0" >
+            AND (SELECT COUNT(up.id) FROM user_profile up WHERE up.user_id = u.user_id AND up.current_status = 1
+            AND INSTR(up.key_value,'"fieldKey":"commitment_seal","value":"oss/images/avatar') = 0) > 0
+        </if>
+        <if test="promiseSign != null promiseSign == 1" >
+            AND (SELECT COUNT(up.id) FROM user_profile up WHERE up.user_id = u.user_id AND up.current_status = 1
+            AND INSTR(up.key_value,'"fieldKey":"commitment_electr_signature","value":"oss/images/avatar') > 0) > 0
+        </if>
+        <if test="promiseSign != null promiseSign == 0" >
+            AND (SELECT COUNT(up.id) FROM user_profile up WHERE up.user_id = u.user_id AND up.current_status = 1
+            AND INSTR(up.key_value,'"fieldKey":"commitment_electr_signature","value":"oss/images/avatar') = 0) > 0
+        </if>
         order by u.user_id desc
     </select>
 

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -816,8 +816,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND usu.order_goods_id = us.order_goods_id
         AND usu.subscribe_status = 1
         ) >1
-        THEN 2
-        ELSE 0 END
+        THEN 0 ELSE NULL END
         AS applyNew
         FROM user_subscribe us
         LEFT JOIN order_goods og ON us.order_goods_id = og.order_goods_id
@@ -846,7 +845,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND m.id = #{majorId}
         </if>
         <if test="goodsName != null and goodsName !='' ">
-            AND g.goods_name = #{goodsName}
+            AND g.goods_name LIKE concat('%',#{goodsName},'%')
         </if>
         <if test="applyStatus != null ">
             AND us.result = #{applyStatus}
@@ -913,7 +912,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND m.id = #{majorId}
         </if>
         <if test="goodsName != null and goodsName !='' ">
-            AND g.goods_name = #{goodsName}
+            AND g.goods_name LIKE concat('%',#{goodsName},'%')
         </if>
     </select>