Merge remote-tracking branch 'origin/dev/icss' into dev/icss

icss-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -151,7 +151,12 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 		if(hisInquirysVO.getEndDate()!=null){
 			queryWrapper.le("gmt_create", hisInquirysVO.getEndDate());
 		}
-		queryWrapper.orderByDesc("gmt_create");
+		if(hisInquirysVO.getOrderType()==1){
+			queryWrapper.orderByDesc("gmt_create");
+		}else if(hisInquirysVO.getOrderType()==2){
+			queryWrapper.orderByAsc("gmt_create");
+		}
+		
 		List<InquiryInfo> inquiryInfoList = this.list(queryWrapper);
 
 		List<HisInquiryDTO> hisInquiryDTOList = BeanUtil.listCopyTo(inquiryInfoList, HisInquiryDTO.class);

icss-service/src/main/java/com/diagbot/facade/TemplateInfoFacade.java

@@ -14,6 +14,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.TemplateInfoServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.GsonUtil;
+import com.diagbot.util.UserUtils;
 import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoVO;
 import com.diagbot.vo.TemplateInfosIdVO;
@@ -137,7 +138,9 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
 		UpdateWrapper<TemplateInfo> templateInfoNew = new UpdateWrapper<>();
 		templateInfoNew.in("id", splitIds)
 		               .eq("is_deleted", IsDeleteEnum.N.getKey())
-		               .set("is_deleted",IsDeleteEnum.Y.getKey());
+		               .set("is_deleted",IsDeleteEnum.Y.getKey())
+		               .set("modifier",UserUtils.getCurrentPrincipleID())
+		               .set("gmt_modified ",DateUtil.now());
 		boolean res = update(new TemplateInfo(), templateInfoNew);
 		
 		return res;

icss-service/src/main/java/com/diagbot/vo/HisInquirysVO.java

@@ -73,5 +73,11 @@ public class HisInquirysVO {
 	@ApiModelProperty(value="结束时间，格式为：2018-11-28 17:25:30")
 	@DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
 	private Date endDate;
+	
+	/**
+	 * 排序类型：1、时间降序；2、时间升序； 
+	 */
+	@ApiModelProperty(value="排序类型：1、时间降序；2、时间升序；")
+	private Integer orderType=1;
 	   
 }

icssman-service/src/main/java/com/diagbot/web/IntroduceDetailController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -39,4 +40,22 @@ public class IntroduceDetailController {
         List<IntroduceDetail> data = introduceDetailFacade.getByIntroduceId(introduceId);
         return RespDTO.onSuc(data);
     }
+
+    @ApiOperation(value = "删除单条提示信息明细[by:zhaops]",
+            notes = "id: id,必填")
+    @PostMapping("/deleteRecord")
+    @SysLogger("deleteRecord")
+    public RespDTO<Boolean> deleteRecord(@RequestParam Long id) {
+        Boolean data = introduceDetailFacade.removeById(id);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "批量删除提示信息明细[by:zhaops]",
+            notes = "ids: ids,必填")
+    @PostMapping("/deleteRecords")
+    @SysLogger("deleteRecords")
+    public RespDTO<Boolean> deleteRecords(@RequestParam Long[] ids) {
+        Boolean data = introduceDetailFacade.removeByIds(Arrays.asList(ids));
+        return RespDTO.onSuc(data);
+    }
 }