Commit d917eaee by jiangyun

修改

parent 3fcdfc49
package com.zjsgfa.project.zjsgfa.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.zjsgfa.framework.aspectj.lang.annotation.Log;
import com.zjsgfa.framework.aspectj.lang.enums.BusinessType;
import com.zjsgfa.project.zjsgfa.domain.Czsms;
import com.zjsgfa.project.zjsgfa.service.ICzsmsService;
import com.zjsgfa.framework.web.controller.BaseController;
import com.zjsgfa.framework.web.domain.AjaxResult;
import com.zjsgfa.common.utils.poi.ExcelUtil;
import com.zjsgfa.framework.web.page.TableDataInfo;
/**
* 操作说明书Controller
*
* @author ruoyi
* @date 2026-03-25
*/
@RestController
@RequestMapping("/system/czsms")
public class CzsmsController extends BaseController
{
@Autowired
private ICzsmsService czsmsService;
/**
* 查询操作说明书列表
*/
//@PreAuthorize("@ss.hasPermi('system:czsms:list')")
@GetMapping("/list")
public TableDataInfo list(Czsms czsms)
{
// startPage();
List<Czsms> list = czsmsService.selectCzsmsList(czsms);
return getDataTable(list);
}
/**
* 导出操作说明书列表
*/
//@PreAuthorize("@ss.hasPermi('system:czsms:export')")
@Log(title = "操作说明书", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, Czsms czsms)
{
List<Czsms> list = czsmsService.selectCzsmsList(czsms);
ExcelUtil<Czsms> util = new ExcelUtil<Czsms>(Czsms.class);
util.exportExcel(response, list, "操作说明书数据");
}
/**
* 获取操作说明书详细信息
*/
//@PreAuthorize("@ss.hasPermi('system:czsms:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(czsmsService.selectCzsmsById(id));
}
/**
* 新增操作说明书
*/
//@PreAuthorize("@ss.hasPermi('system:czsms:add')")
@Log(title = "操作说明书", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody Czsms czsms)
{
return toAjax(czsmsService.insertCzsms(czsms));
}
/**
* 修改操作说明书
*/
//@PreAuthorize("@ss.hasPermi('system:czsms:edit')")
@Log(title = "操作说明书", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody Czsms czsms)
{
return toAjax(czsmsService.updateCzsms(czsms));
}
/**
* 删除操作说明书
*/
//@PreAuthorize("@ss.hasPermi('system:czsms:remove')")
@Log(title = "操作说明书", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(czsmsService.deleteCzsmsByIds(ids));
}
@GetMapping(value ="/getFilePath")
public Map<String, Object> getFilePath(HttpServletResponse response)
{
List<Czsms> czsms = czsmsService.selectCzsmsList(new Czsms());
String filePath = "";
if(czsms.size()>0){
filePath = czsms.get(0).getFilePath();
}
Map<String, Object> map = new HashMap<>();
map.put("filePath", filePath);
return map;
}
}
...@@ -23,6 +23,7 @@ import com.google.gson.Gson; ...@@ -23,6 +23,7 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.zjsgfa.common.constant.Constants; import com.zjsgfa.common.constant.Constants;
import com.zjsgfa.common.utils.DateUtils;
import com.zjsgfa.common.utils.StringUtils; import com.zjsgfa.common.utils.StringUtils;
import com.zjsgfa.common.utils.bean.BeanUtils; import com.zjsgfa.common.utils.bean.BeanUtils;
import com.zjsgfa.common.utils.file.FileUploadUtils; import com.zjsgfa.common.utils.file.FileUploadUtils;
...@@ -2620,22 +2621,38 @@ public class SjDjjcController extends BaseController { ...@@ -2620,22 +2621,38 @@ public class SjDjjcController extends BaseController {
if (StringUtils.isNotEmpty(bizTodoItem.getDzqm())) { if (StringUtils.isNotEmpty(bizTodoItem.getDzqm())) {
Map<String, PictureRenderData> pictureMap = createPictureMap(bizTodoItem.getDzqm(), 120, 40); Map<String, PictureRenderData> pictureMap = createPictureMap(bizTodoItem.getDzqm(), 120, 40);
mapSp.put("spr", pictureMap.get("jwt")); mapSp.put("spr", pictureMap.get("jwt"));
mapSp.put("condition", true);
} else { } else {
mapSp.put("spr", null); mapSp.put("spr", bizTodoItem.getHandleUserName());
mapSp.put("condition", false);
} }
mapSp.put("spyj", bizTodoItem.getComment()); mapSp.put("spyj", bizTodoItem.getComment());
spList.add(mapSp); spList.add(mapSp);
} }
if(bizTodoItemList.size()>0){
if(StringUtils.isNotEmpty(bizTodoItemList.get(bizTodoItemList.size()-1).getHandleUserName())){
dataModel.put("pjrmc", bizTodoItemList.get(bizTodoItemList.size()-1).getHandleUserName());
}else {
dataModel.put("pjrmc", "");
}
}else {
dataModel.put("pjrmc", "");
}
dataModel.put("spList", spList); dataModel.put("spList", spList);
} else { } else {
dataModel.put("spList", new ArrayList<>()); dataModel.put("spList", new ArrayList<>());
dataModel.put("pjrmc", "");
} }
} else { } else {
dataModel.put("spList", new ArrayList<>()); dataModel.put("spList", new ArrayList<>());
dataModel.put("pjrmc", "");
} }
// 添加基础信息 // 添加基础信息
dataModel.put("cjrmc", sjDjjc.getCjrmc());
dataModel.put("cjrrq", DateUtils.parseDateToStr("yyyy-MM-dd",sjDjjc.getCreatedTime()));
dataModel.put("jh", jh); dataModel.put("jh", jh);
dataModel.put("jb", sjDjjc.getJb()); dataModel.put("jb", sjDjjc.getJb());
dataModel.put("jx", sjDjjc.getJx()); dataModel.put("jx", sjDjjc.getJx());
......
package com.zjsgfa.project.zjsgfa.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zjsgfa.framework.aspectj.lang.annotation.Excel;
import com.zjsgfa.framework.web.domain.BaseEntity;
import lombok.Data;
/**
* 操作说明书对象 czsms
*
* @author ruoyi
* @date 2026-03-25
*/
@Data
public class Czsms extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
private Long id;
/** 文件名 */
@Excel(name = "文件名")
private String fileName;
/** 后缀名 */
@Excel(name = "后缀名")
private String fileSuffix;
/** 文件类型 */
@Excel(name = "文件类型")
private String fileType;
/** 文件路径 */
@Excel(name = "文件路径")
private String filePath;
/** 创建人 */
@Excel(name = "创建人")
private String createdBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createdTime;
}
package com.zjsgfa.project.zjsgfa.mapper;
import java.util.List;
import com.zjsgfa.project.zjsgfa.domain.Czsms;
/**
* 操作说明书Mapper接口
*
* @author ruoyi
* @date 2026-03-25
*/
public interface CzsmsMapper
{
/**
* 查询操作说明书
*
* @param id 操作说明书主键
* @return 操作说明书
*/
public Czsms selectCzsmsById(Long id);
/**
* 查询操作说明书列表
*
* @param czsms 操作说明书
* @return 操作说明书集合
*/
public List<Czsms> selectCzsmsList(Czsms czsms);
/**
* 新增操作说明书
*
* @param czsms 操作说明书
* @return 结果
*/
public int insertCzsms(Czsms czsms);
/**
* 修改操作说明书
*
* @param czsms 操作说明书
* @return 结果
*/
public int updateCzsms(Czsms czsms);
/**
* 删除操作说明书
*
* @param id 操作说明书主键
* @return 结果
*/
public int deleteCzsmsById(Long id);
/**
* 批量删除操作说明书
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteCzsmsByIds(Long[] ids);
}
package com.zjsgfa.project.zjsgfa.service;
import java.util.List;
import com.zjsgfa.project.zjsgfa.domain.Czsms;
/**
* 操作说明书Service接口
*
* @author ruoyi
* @date 2026-03-25
*/
public interface ICzsmsService
{
/**
* 查询操作说明书
*
* @param id 操作说明书主键
* @return 操作说明书
*/
public Czsms selectCzsmsById(Long id);
/**
* 查询操作说明书列表
*
* @param czsms 操作说明书
* @return 操作说明书集合
*/
public List<Czsms> selectCzsmsList(Czsms czsms);
/**
* 新增操作说明书
*
* @param czsms 操作说明书
* @return 结果
*/
public int insertCzsms(Czsms czsms);
/**
* 修改操作说明书
*
* @param czsms 操作说明书
* @return 结果
*/
public int updateCzsms(Czsms czsms);
/**
* 批量删除操作说明书
*
* @param ids 需要删除的操作说明书主键集合
* @return 结果
*/
public int deleteCzsmsByIds(Long[] ids);
/**
* 删除操作说明书信息
*
* @param id 操作说明书主键
* @return 结果
*/
public int deleteCzsmsById(Long id);
}
package com.zjsgfa.project.zjsgfa.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zjsgfa.project.zjsgfa.mapper.CzsmsMapper;
import com.zjsgfa.project.zjsgfa.domain.Czsms;
import com.zjsgfa.project.zjsgfa.service.ICzsmsService;
/**
* 操作说明书Service业务层处理
*
* @author ruoyi
* @date 2026-03-25
*/
@Service
public class CzsmsServiceImpl implements ICzsmsService
{
@Autowired
private CzsmsMapper czsmsMapper;
/**
* 查询操作说明书
*
* @param id 操作说明书主键
* @return 操作说明书
*/
@Override
public Czsms selectCzsmsById(Long id)
{
return czsmsMapper.selectCzsmsById(id);
}
/**
* 查询操作说明书列表
*
* @param czsms 操作说明书
* @return 操作说明书
*/
@Override
public List<Czsms> selectCzsmsList(Czsms czsms)
{
return czsmsMapper.selectCzsmsList(czsms);
}
/**
* 新增操作说明书
*
* @param czsms 操作说明书
* @return 结果
*/
@Override
public int insertCzsms(Czsms czsms)
{
return czsmsMapper.insertCzsms(czsms);
}
/**
* 修改操作说明书
*
* @param czsms 操作说明书
* @return 结果
*/
@Override
public int updateCzsms(Czsms czsms)
{
return czsmsMapper.updateCzsms(czsms);
}
/**
* 批量删除操作说明书
*
* @param ids 需要删除的操作说明书主键
* @return 结果
*/
@Override
public int deleteCzsmsByIds(Long[] ids)
{
return czsmsMapper.deleteCzsmsByIds(ids);
}
/**
* 删除操作说明书信息
*
* @param id 操作说明书主键
* @return 结果
*/
@Override
public int deleteCzsmsById(Long id)
{
return czsmsMapper.deleteCzsmsById(id);
}
}
...@@ -114,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -114,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
biz.instance_id = #{instanceId} biz.instance_id = #{instanceId}
AND biz.id > ( SELECT max( id ) FROM biz_todo_item WHERE instance_id = #{instanceId} AND task_name = 'taskTb' ) AND biz.id > ( SELECT max( id ) FROM biz_todo_item WHERE instance_id = #{instanceId} AND task_name = 'taskTb' )
AND biz.is_handle = '1' AND biz.is_handle = '1'
order by biz.handle_time
</select> </select>
<insert id="insertBizTodoItem" parameterType="BizTodoItem" useGeneratedKeys="true" keyProperty="id"> <insert id="insertBizTodoItem" parameterType="BizTodoItem" useGeneratedKeys="true" keyProperty="id">
......
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zjsgfa.project.zjsgfa.mapper.CzsmsMapper">
<resultMap type="Czsms" id="CzsmsResult">
<result property="id" column="id" />
<result property="fileName" column="file_name" />
<result property="fileSuffix" column="file_suffix" />
<result property="fileType" column="file_type" />
<result property="filePath" column="file_path" />
<result property="createdBy" column="created_by" />
<result property="createdTime" column="created_time" />
</resultMap>
<sql id="selectCzsmsVo">
select id, file_name, file_suffix, file_type, file_path, created_by, created_time from czsms
</sql>
<select id="selectCzsmsList" parameterType="Czsms" resultMap="CzsmsResult">
<include refid="selectCzsmsVo"/>
<where>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
<if test="fileSuffix != null and fileSuffix != ''"> and file_suffix = #{fileSuffix}</if>
<if test="fileType != null and fileType != ''"> and file_type = #{fileType}</if>
<if test="filePath != null and filePath != ''"> and file_path = #{filePath}</if>
<if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if>
<if test="createdTime != null "> and created_time = #{createdTime}</if>
</where>
order by created_time desc
</select>
<select id="selectCzsmsById" parameterType="Long" resultMap="CzsmsResult">
<include refid="selectCzsmsVo"/>
where id = #{id}
</select>
<insert id="insertCzsms" parameterType="Czsms" useGeneratedKeys="true" keyProperty="id">
insert into czsms
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="fileName != null">file_name,</if>
<if test="fileSuffix != null">file_suffix,</if>
<if test="fileType != null">file_type,</if>
<if test="filePath != null">file_path,</if>
<if test="createdBy != null">created_by,</if>
<if test="createdTime != null">created_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="fileName != null">#{fileName},</if>
<if test="fileSuffix != null">#{fileSuffix},</if>
<if test="fileType != null">#{fileType},</if>
<if test="filePath != null">#{filePath},</if>
<if test="createdBy != null">#{createdBy},</if>
<if test="createdTime != null">#{createdTime},</if>
</trim>
</insert>
<update id="updateCzsms" parameterType="Czsms">
update czsms
<trim prefix="SET" suffixOverrides=",">
<if test="fileName != null">file_name = #{fileName},</if>
<if test="fileSuffix != null">file_suffix = #{fileSuffix},</if>
<if test="fileType != null">file_type = #{fileType},</if>
<if test="filePath != null">file_path = #{filePath},</if>
<if test="createdBy != null">created_by = #{createdBy},</if>
<if test="createdTime != null">created_time = #{createdTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteCzsmsById" parameterType="Long">
delete from czsms where id = #{id}
</delete>
<delete id="deleteCzsmsByIds" parameterType="String">
delete from czsms where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment