Commit 89a118bb authored by 赵啸非's avatar 赵啸非

添加级联删除事项材料

parent bd781956
...@@ -2,8 +2,6 @@ DROP database if exists `sample-form-platform`; ...@@ -2,8 +2,6 @@ DROP database if exists `sample-form-platform`;
CREATE database `sample-form-platform` default charset=utf8; CREATE database `sample-form-platform` default charset=utf8;
use `sample-form-platform`; use `sample-form-platform`;
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ---------------------------- -- ----------------------------
-- Table structure for mortals_xhx_idgenerator -- Table structure for mortals_xhx_idgenerator
...@@ -295,7 +293,7 @@ CREATE TABLE mortals_xhx_user( ...@@ -295,7 +293,7 @@ CREATE TABLE mortals_xhx_user(
`createUserName` varchar(50) COMMENT '创建用户名称', `createUserName` varchar(50) COMMENT '创建用户名称',
`lastLoginTime` datetime COMMENT '最后一次登录时间', `lastLoginTime` datetime COMMENT '最后一次登录时间',
`lastLoginAddress` varchar(21) COMMENT '最后一次登录地址', `lastLoginAddress` varchar(21) COMMENT '最后一次登录地址',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户信息业务'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户信息业务';
......
package com.mortals.xhx.module.matter.model; package com.mortals.xhx.module.matter.model;
import java.util.List;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.matter.model.vo.MatterVo; import com.mortals.xhx.module.matter.model.vo.MatterVo;
import com.mortals.xhx.module.matter.model.MatterDatumEntity;
/** /**
* 事项申请材料业务实体对象 * 事项申请材料业务实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-10 * @date 2022-11-17
*/ */
public class MatterEntity extends MatterVo { public class MatterEntity extends MatterVo {
...@@ -77,6 +78,10 @@ public class MatterEntity extends MatterVo { ...@@ -77,6 +78,10 @@ public class MatterEntity extends MatterVo {
*/ */
private Integer source; private Integer source;
/**
* 事项申请材料业务信息
*/
private List<MatterDatumEntity> matterDatumList=new ArrayList<>();;
public MatterEntity(){} public MatterEntity(){}
...@@ -292,6 +297,13 @@ public class MatterEntity extends MatterVo { ...@@ -292,6 +297,13 @@ public class MatterEntity extends MatterVo {
} }
public List<MatterDatumEntity> getMatterDatumList(){
return matterDatumList;
}
public void setMatterDatumList(List<MatterDatumEntity> matterDatumList){
this.matterDatumList = matterDatumList;
}
@Override @Override
......
package com.mortals.xhx.module.matter.model; package com.mortals.xhx.module.matter.model;
import java.util.List;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.matter.model.MatterEntity; import com.mortals.xhx.module.matter.model.MatterEntity;
/** /**
* 事项申请材料业务查询对象 * 事项申请材料业务查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-10 * @date 2022-11-17
*/ */
public class MatterQuery extends MatterEntity { public class MatterQuery extends MatterEntity {
/** 开始 主键,自增长 */ /** 开始 主键,自增长 */
......
...@@ -18,6 +18,4 @@ public class MatterVo extends BaseEntityLong { ...@@ -18,6 +18,4 @@ public class MatterVo extends BaseEntityLong {
/** 材料数量 */ /** 材料数量 */
private Integer datumCount; private Integer datumCount;
private List<MatterDatumEntity> matterDatumList;
} }
\ No newline at end of file
...@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; ...@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -132,4 +133,11 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter ...@@ -132,4 +133,11 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
this.update(matterEntity, context); this.update(matterEntity, context);
return Rest.ok(msg); return Rest.ok(msg);
} }
@Override
protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
List<MatterDatumEntity> matterDatumlist = matterDatumService.find(new MatterDatumQuery().matterIdList(Arrays.asList(ids)));
matterDatumService.removeList(matterDatumlist,context);
super.removeAfter(ids, context, result);
}
} }
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.matter.dao.ibatis.MatterDaoImpl"> <mapper namespace="com.mortals.xhx.module.matter.dao.ibatis.MatterDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -24,7 +24,27 @@ ...@@ -24,7 +24,27 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<collection property="matterDatumList" column="id" ofType="MatterDatumEntity" javaType="ArrayList" select="getMatterDatumByMatterId"></collection>
</resultMap>
<resultMap type="MatterDatumEntity" id="MatterDatumEntity-Map">
<result property="id" column="id" />
<result property="matterId" column="matterId" />
<result property="siteId" column="siteId" />
<result property="deptId" column="deptId" />
<result property="deptCode" column="deptCode" />
<result property="deptName" column="deptName" />
<result property="materialName" column="materialName" />
<result property="materiaFullName" column="materiaFullName" />
<result property="source" column="source" />
<result property="isRecommend" column="isRecommend" />
<result property="total" column="total" />
<result property="sort" column="sort" />
<result property="sampleName" column="sampleName" />
<result property="samplePath" column="samplePath" />
<result property="preViewPath" column="preViewPath" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" />
</resultMap> </resultMap>
...@@ -90,6 +110,12 @@ ...@@ -90,6 +110,12 @@
</if> </if>
</trim> </trim>
</sql> </sql>
<!-- 子表所有列 -->
<sql id="_columns_sub">
<trim suffixOverrides="," suffix="">
b.id,b.matterId,b.siteId,b.deptId,b.deptCode,b.deptName,b.materialName,b.materiaFullName,b.source,b.isRecommend,b.total,b.sort,b.sampleName,b.samplePath,b.preViewPath,b.createTime,b.createUserId,b.updateTime,
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="MatterEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="MatterEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_matter insert into mortals_xhx_matter
...@@ -407,6 +433,14 @@ ...@@ -407,6 +433,14 @@
</trim> </trim>
<include refid="_orderCols_"/> <include refid="_orderCols_"/>
</select> </select>
<!-- 获取子列表 -->
<select id="getMatterDatumByMatterId" parameterType="java.lang.Long" resultMap="MatterDatumEntity-Map">
select <include refid="_columns_sub"/>
from mortals_xhx_matter_datum as b
<trim suffixOverrides="where" suffix="">
where b.matterId = #{id}
</trim>
</select>
......
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