bug修改

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/ImageClassificationFile.java

@@ -84,6 +84,11 @@ public class ImageClassificationFile extends BaseEntity {
      */
     @ApiModelProperty("文件所在路径")
     private String imageUrl;
+    /**
+     * pdf文件所在路径
+     */
+    @ApiModelProperty("pdf文件所在路径")
+    private String pdfUrl;
     /**
      * 拍摄者
      */

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/ImageClassificationFileVO.java

@@ -20,7 +20,6 @@ import io.swagger.annotations.ApiModelProperty;
 import org.springblade.business.entity.ImageClassificationFile;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -35,11 +34,6 @@ import java.util.List;
 public class ImageClassificationFileVO extends ImageClassificationFile {
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 附件
-	 */
-	private MultipartFile file;
-
 	/**
 	 * 是否修改
 	 */

blade-service/blade-business/src/main/java/org/springblade/business/controller/BusinessUserOpinionController.java

@@ -20,6 +20,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springframework.web.bind.annotation.*;
 import java.util.Date;
 import java.util.List;
@@ -49,6 +50,12 @@ public class BusinessUserOpinionController {
         //总数
         Integer count = this.userOpinionFlowService.countUserAssessmentPageList(vo);
         //分页数据
+        if(StringUtils.isNotEmpty(vo.getEndTime())){
+            //因为between的含头不含尾属性，需要给结尾时间+1
+            String endTime = vo.getEndTime();
+            endTime = DateUtil.format(org.apache.commons.lang.time.DateUtils.addDays(DateUtil.parse(endTime, "yyyy-MM-dd hh:mm"), 1), "yyyy-MM-dd hh:mm");
+            vo.setEndTime(endTime);
+        }
         List<AssessmentUserVOS> result = this.userOpinionFlowService.queryUserAssessmentPage(vo);
 
         iPage.setTotal(count);

blade-service/blade-business/src/main/java/org/springblade/business/controller/ImageClassificationFileController.java

@@ -16,7 +16,6 @@ import org.springblade.business.vo.ImageClassificationShowVO;
 import org.springblade.business.vo.TreeVo;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -35,7 +34,6 @@ import org.springblade.business.vo.ImageClassificationFileVO;
 import org.springblade.business.service.IImageClassificationFileService;
 import org.springblade.core.boot.ctrl.BladeController;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  *  影音资料控制器（客户端）
@@ -116,17 +114,17 @@ public class ImageClassificationFileController extends BladeController {
 				//校验一下是否已经存在数据
 				long count = this.imageClassificationShowService.count(Wrappers.<ImageClassificationShow>lambdaQuery().eq(ImageClassificationShow::getClassifyId, show.getClassifyId()).eq(ImageClassificationShow::getProjectId, show.getProjectId()).eq(ImageClassificationShow::getContractId, show.getContractId()));
 				if(count == 0){
-					setUserData(show, true);
+					setUserData(show, null, true);
 					ImageClassificationShow newShow = new ImageClassificationShow();
 					BeanUtils.copyProperties(show, newShow);
 					newShow.setId(null);
 					saveShow.add(newShow);
 				} else {
-					setUserData(show, false);
+					setUserData(show, null, false);
 					updateShow.add(show);
 				}
 			} else {
-				setUserData(show, false);
+				setUserData(show, null, false);
 				updateShow.add(show);
 			}
 		});
@@ -335,7 +333,7 @@ public class ImageClassificationFileController extends BladeController {
 	public R<Boolean> save(@Valid @RequestBody ImageClassificationFileVO fileVO){
 		try{
 			ImageClassificationFile newFile = this.copyBeanData(fileVO, true);
-			this.setUserData(newFile, false);
+			this.setUserData(null, newFile, false);
 			//落库数据
 			return R.status(this.imageClassificationFileService.save(newFile));
 		}catch (Exception e){
@@ -360,7 +358,7 @@ public class ImageClassificationFileController extends BladeController {
 			e.printStackTrace();
 		}
 		//设置用户信息
-		setUserData(newFile, isCreate);
+		setUserData(null, newFile, isCreate);
 		return newFile;
 	}
 
@@ -375,30 +373,26 @@ public class ImageClassificationFileController extends BladeController {
 	}
 
 	//设置登录用户信息
-	private void setUserData(ImageClassificationShow imageClassificationShow, boolean isCreate){
-		//获取当前登录人
-		BladeUser user = AuthUtil.getUser();
+	private void setUserData(ImageClassificationShow imageClassificationShow, ImageClassificationFile imageClassificationFile, boolean isCreate){
 		//记录操作人信息
 		if(isCreate){
-			imageClassificationShow.setCreateUser(user.getUserId());
-			imageClassificationShow.setCreateDept(user.getDeptId().contains(",") ? Long.parseLong(user.getDeptId().split(",")[0]) : Long.parseLong(user.getDeptId()));
-		} else {
-			imageClassificationShow.setUpdateUser(user.getUserId());
-			imageClassificationShow.setUpdateTime(new Date());
-		}
-	}
-
-	//设置登录用户信息
-	private void setUserData(ImageClassificationFile imageClassificationFile, boolean isCreate){
-		//获取当前登录人
-		BladeUser user = AuthUtil.getUser();
-		//记录操作人信息
-		if(isCreate){
-			imageClassificationFile.setCreateUser(user.getUserId());
-			imageClassificationFile.setCreateDept(user.getDeptId().contains(",") ? Long.parseLong(user.getDeptId().split(",")[0]) : Long.parseLong(user.getDeptId()));
+			if(imageClassificationShow != null){
+				imageClassificationShow.setCreateUser(AuthUtil.getUserId());
+				imageClassificationShow.setCreateDept(AuthUtil.getDeptId().contains(",") ? Long.parseLong(AuthUtil.getDeptId().split(",")[0]) : Long.parseLong(AuthUtil.getDeptId()));
+			}
+			if(imageClassificationFile != null){
+				imageClassificationFile.setCreateUser(AuthUtil.getUserId());
+				imageClassificationFile.setCreateDept(AuthUtil.getDeptId().contains(",") ? Long.parseLong(AuthUtil.getDeptId().split(",")[0]) : Long.parseLong(AuthUtil.getDeptId()));
+			}
 		} else {
-			imageClassificationFile.setUpdateUser(user.getUserId());
-			imageClassificationFile.setUpdateTime(new Date());
+			if(imageClassificationShow != null){
+				imageClassificationShow.setUpdateUser(AuthUtil.getUserId());
+				imageClassificationShow.setUpdateTime(new Date());
+			}
+			if(imageClassificationFile != null){
+				imageClassificationFile.setUpdateUser(AuthUtil.getUserId());
+				imageClassificationFile.setUpdateTime(new Date());
+			}
 		}
 	}
 

blade-service/blade-business/src/main/java/org/springblade/business/controller/UserOpinionFlowController.java

@@ -25,7 +25,9 @@ import lombok.AllArgsConstructor;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
+import org.springblade.business.entity.AssessmentUser;
 import org.springblade.business.entity.UserOpinion;
+import org.springblade.business.service.IAssessmentUserService;
 import org.springblade.business.service.IUserOpinionService;
 import org.springblade.business.vo.UserOpinionFlowVO;
 import org.springblade.core.secure.BladeUser;
@@ -58,6 +60,8 @@ public class UserOpinionFlowController extends BladeController {
 
 	private final IUserOpinionService userOpinionService;
 
+	private final IAssessmentUserService assessmentUserService;
+
 	/**
 	 * 统合接口
 	 * @param oldEndFlow 流程图的最后一个节点ID
@@ -96,6 +100,15 @@ public class UserOpinionFlowController extends BladeController {
 	private R<Boolean> updateCurrentUserOpinionFlow(String oldEndFlow, Integer type){
 		UserOpinionFlow oldFlow = this.userOpinionFlowService.getById(oldEndFlow);
 		oldFlow.setEvaluation(type);
+
+		//被投诉，新增考核信息
+		AssessmentUser assessmentUser = new AssessmentUser();
+		assessmentUser.setUserOpinionFlowId(Long.parseLong(oldEndFlow));
+		assessmentUser.setAssessmentUser(oldFlow.getManageUser().toString());
+		assessmentUser.setCreateUser(AuthUtil.getUserId());
+		assessmentUser.setCreateTime(new Date());
+		this.assessmentUserService.save(assessmentUser);
+
 		return R.data(this.userOpinionFlowService.updateById(this.setUserData(oldFlow, false)));
 	}
 

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ImageClassificationFileMapper.xml

@@ -28,6 +28,7 @@
         <result column="film_code" property="filmCode"/>
         <result column="see_also_code" property="seeAlsoCode"/>
         <result column="text_content" property="textContent"/>
+        <result column="pdf_url" property="pdfUrl"/>
     </resultMap>
 
     <select id="queryCurrentClassifyAllFileCount" resultType="java.lang.Integer">
@@ -54,6 +55,7 @@
             files.shooting_time,
             files.file_size,
             files.image_url,
+            files.pdf_url,
             files.type
         from
         (
@@ -65,6 +67,7 @@
                 shooting_time,
                 file_size,
                 image_url,
+                pdf_url,
                 type,
                 date_format(shooting_time,'%Y-%m-%d') as shootingTimeStr
             from u_image_classification_file where is_deleted = 0