wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

年检管理

dev
277151821@qq.com 2024-03-15 11:23:46 +08:00
parent 7476fb62b3
commit 3e79f43c2f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/controller/system/ImgFilesController.java
View File

@ -62,7 +62,7 @@ public class ImgFilesController extends BaseController {
// 保存文件 // 保存文件
File tempFile = new File(file.getOriginalFilename()); File tempFile = new File(file.getOriginalFilename());
FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile); FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile);
if(!FileUpload.isImage(tempFile) && !TYPE.equals("2") && !TYPE.equals("3")) {//四色图改为json文件,不用判断类型 if(!FileUpload.isImage(tempFile) && !TYPE.equals("2") && !TYPE.equals("3") && !TYPE.equals("129")) {//四色图改为json文件,不用判断类型
map.put("result", "failed"); map.put("result", "failed");
map.put("exception", "上传图片格式不正确，请重新上传"); map.put("exception", "上传图片格式不正确，请重新上传");
return map; return map;

2
src/main/resources/mybatis/datasource/inspectAnnually/InspectAnnuallyMapper.xml
View File

@ -207,7 +207,7 @@ CREATTIME
and f.REMINDER_STATUS = #{pd.REMINDER_STATUS} and f.REMINDER_STATUS = #{pd.REMINDER_STATUS}
</if> </if>
<if test="pd.DUE_DATE_TYPE != null and pd.DUE_DATE_TYPE != ''"> <if test="pd.DUE_DATE_TYPE != null and pd.DUE_DATE_TYPE != ''">
and case when f.DUE_DATE &lt; NOW() then 1 else 0 end = #{pd.DUE_DATE_TYPE} and case when f.DUE_DATE &lt; NOW() then 0 else 1 end = #{pd.DUE_DATE_TYPE}
</if> </if>
ORDER BY f.CREATTIME DESC ORDER BY f.CREATTIME DESC
</select> </select>