搜索条件新增

zhongzheng-admin/pom.xml

@@ -24,6 +24,8 @@
             <optional>true</optional> <!-- 表示依赖不会传递 -->
         </dependency>
 
+
+
 <!--        &lt;!&ndash; swagger2&ndash;&gt;-->
 <!--        <dependency>-->
 <!--            <groupId>io.springfox</groupId>-->

zhongzheng-api/pom.xml

@@ -10,10 +10,20 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
     <artifactId>zhongzheng-api</artifactId>
-
+    <repositories>
+        <repository>
+            <id>com.e-iceblue</id>
+            <url>https://repo.e-iceblue.cn/repository/maven-public/</url>
+        </repository>
+    </repositories>
 
     <dependencies>
         <!-- spring-boot-devtools -->
+        <dependency>
+            <groupId> e-iceblue </groupId>
+            <artifactId>spire.pdf</artifactId>
+            <version>3.11.6</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>

zhongzheng-api/src/main/java/com/zhongzheng/controller/base/UserProfileStampController.java

@@ -77,7 +77,7 @@ public class UserProfileStampController extends BaseController {
 
     @ApiOperation("导出盖章word")
     @PostMapping("/addWord")
-    public AjaxResult<Void> addWord(@RequestBody UserProfileAddBo bo) throws IOException {
+    public AjaxResult<Void> addWord(@RequestBody UserProfileAddBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         String s = iUserProfileService.addWord(bo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/IUserProfileService.java

@@ -6,6 +6,7 @@ import com.zhongzheng.modules.base.bo.UserProfileQueryBo;
 import com.zhongzheng.modules.base.bo.UserProfileAddBo;
 import com.zhongzheng.modules.base.bo.UserProfileEditBo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -10,6 +10,7 @@ import cn.hutool.extra.template.TemplateUtil;
 import cn.hutool.poi.word.Word07Writer;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.exc.InvalidFormatException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.modules.alioss.bo.OssRequest;

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -36,8 +36,8 @@ public class GoodsVo {
 	@ApiModelProperty("供应方（服务）")
 	private Long supplyId;
 	/** $column.columnComment */
-	@Excel(name = "供应方" , readConverterExp = "商品类型 1视频2题库 3面授 4服务 5组合")
-	@ApiModelProperty("商品类型 1视频2题库 3面授 4服务 5组合")
+	@Excel(name = "供应方" , readConverterExp = "商品类型 1视频2题库 3补考 4前培 ")
+	@ApiModelProperty("商品类型 1视频2题库 3补考 4前培 ")
 	private Long goodsType;
 	/** 教育类型id */
 	@Excel(name = "教育类型id")
@@ -217,7 +217,7 @@ public class GoodsVo {
 	private Long makeEndTime;
 	/** 学习次数 */
 	@Excel(name = "学习次数")
-	@ApiModelProperty("学习次数")
+	@ApiModelProperty("学习次数 前培次数，考培次数")
 	private Long studyCount;
 
 	/** 前培和补考商品关联 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysUserServiceImpl.java

@@ -233,7 +233,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Transactional
     public int updateUser(SysUser user) {
         // 新增用户与角色管理
-        insertUserRole(user);
+        if (!user.getStatus().equals(-1)) {
+            insertUserRole(user);
+        }
         // 新增用户与岗位管理
         insertUserPost(user);
         return baseMapper.updateById(user);

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -54,6 +54,7 @@ import com.zhongzheng.modules.user.bo.OrderPossessUserAddBo;
 import com.zhongzheng.modules.user.bo.UserExamGoodsAddBo;
 import com.zhongzheng.modules.user.bo.UserExamGoodsSupplementAddBo;
 import com.zhongzheng.modules.user.domain.User;
+import com.zhongzheng.modules.user.domain.UserExamGoods;
 import com.zhongzheng.modules.user.service.IOrderPossessUserService;
 import com.zhongzheng.modules.user.service.IUserExamGoodsService;
 import com.zhongzheng.modules.user.service.IUserExamGoodsSupplementService;
@@ -336,19 +337,26 @@ public class WxPayServiceImpl  implements IWxPayService {
         if (goodsVo.getGoodsType().equals(1)){
             if (userExamGoodsService.queryExamGoods(goodsVo.getGoodsId(),order.getUserId()) < 1){
                 ExamNumber examNumber = userExamGoodsService.queryExamGoodsVo(goodsVo.getGoodsId(),order.getUserId());
-                UserExamGoodsAddBo userExamGoodsAddBo = new UserExamGoodsAddBo();
-                userExamGoodsAddBo.setGoodsId(g.getGoodsId());
-                userExamGoodsAddBo.setExamNumber(examNumber.getExamNumber());
-                userExamGoodsAddBo.setDoNumber(examNumber.getDoNumber());
-                userExamGoodsService.insertByAddBo(userExamGoodsAddBo);
+                UserExamGoods add = new UserExamGoods();
+                add.setGoodsId(g.getGoodsId());
+                add.setUserId(order.getUserId());
+                add.setExamNumber(examNumber.getExamNumber());
+                add.setDoNumber(examNumber.getDoNumber());
+                add.setCreateTime(DateUtils.getNowTime());
+                add.setUpdateTime(DateUtils.getNowTime());
+                userExamGoodsService.save(add);
                 UserExamGoodsSupplementAddBo userExamGoodsSupplementAddBo = new UserExamGoodsSupplementAddBo();
-                userExamGoodsSupplementAddBo.setGoodsId(g.getGoodsId());
+                userExamGoodsSupplementAddBo.setGoodsId(add.getUserExamGoodsId());
+                userExamGoodsSupplementAddBo.setExamNumber(g.getGoodsId());
+                userExamGoodsSupplementAddBo.setExamNumber(examNumber.getExamNumber());
+                userExamGoodsSupplementAddBo.setDoNumber(examNumber.getDoNumber());
+                userExamGoodsSupplementAddBo.setStatus(3);
                 userExamGoodsSupplementService.insertByAddBo(userExamGoodsSupplementAddBo);
             }
         }
         //增加前培次数
         if (goodsVo.getGoodsType().equals(4)){
-            Long aLong = userExamGoodsService.queryExamGoods(g.getGoodsId(), order.getUserId());
+
         }
         //增加考试次数
         if (goodsVo.getGoodsType().equals(3)){