bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

任务冲突修改

This commit is contained in:
dingjie 2023-12-14 09:37:38 +08:00
parent 76f5e2d65f
commit 171bea8437
26 changed files with 76 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-api/sgzb-api-system/pom.xml
View File

@ -22,6 +22,10 @@
<groupId>com.bonus.sgzb</groupId> <groupId>com.bonus.sgzb</groupId>
<artifactId>sgzb-common-core</artifactId> <artifactId>sgzb-common-core</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies> </dependencies>

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java → sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.app.domain; package com.bonus.sgzb.base.api.domain;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java → sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.app.domain; package com.bonus.sgzb.base.api.domain;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java → sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java
View File

@ -1,4 +1,4 @@
package com.bonus.sgzb.app.domain; package com.bonus.sgzb.base.api.domain;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

12
sgzb-auth/pom.xml
View File

@ -55,12 +55,12 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.bonus.sgzb</groupId> <!-- <groupId>com.bonus.sgzb</groupId>-->
<artifactId>sgzb-modules-system</artifactId> <!-- <artifactId>sgzb-modules-system</artifactId>-->
<version>3.6.3</version> <!-- <version>3.6.3</version>-->
<scope>compile</scope> <!-- <scope>compile</scope>-->
</dependency> <!-- </dependency>-->
</dependencies> </dependencies>

6
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
View File

@ -1,8 +1,8 @@
package com.bonus.sgzb.app.controller; package com.bonus.sgzb.app.controller;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.bonus.sgzb.app.domain.LeaseApplyDetails; import com.bonus.sgzb.base.api.domain.LeaseApplyDetails;
import com.bonus.sgzb.app.domain.LeaseApplyInfo; import com.bonus.sgzb.base.api.domain.LeaseApplyInfo;
import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.base.api.domain.TmTask;
import com.bonus.sgzb.app.service.LeaseApplyDetailsService; import com.bonus.sgzb.app.service.LeaseApplyDetailsService;
import com.bonus.sgzb.app.service.LeaseApplyInfoService; import com.bonus.sgzb.app.service.LeaseApplyInfoService;
import com.bonus.sgzb.app.service.TmTaskService; import com.bonus.sgzb.app.service.TmTaskService;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.app.mapper; package com.bonus.sgzb.app.mapper;
import com.bonus.sgzb.app.domain.LeaseApplyDetails; import com.bonus.sgzb.base.api.domain.LeaseApplyDetails;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyInfoMapper.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.app.mapper; package com.bonus.sgzb.app.mapper;
import com.bonus.sgzb.app.domain.LeaseApplyInfo; import com.bonus.sgzb.base.api.domain.LeaseApplyInfo;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
View File

@ -1,6 +1,6 @@
package com.bonus.sgzb.app.mapper; package com.bonus.sgzb.app.mapper;
import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.base.api.domain.TmTask;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseApplyDetailsService.java
View File

@ -1,7 +1,7 @@
package com.bonus.sgzb.app.service; package com.bonus.sgzb.app.service;
import java.util.List; import java.util.List;
import com.bonus.sgzb.app.domain.LeaseApplyDetails; import com.bonus.sgzb.base.api.domain.LeaseApplyDetails;
/** /**
* Description: * Description:
* @Author 阮世耀 * @Author 阮世耀

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseApplyInfoService.java
View File

@ -1,7 +1,7 @@
package com.bonus.sgzb.app.service; package com.bonus.sgzb.app.service;
import java.util.List; import java.util.List;
import com.bonus.sgzb.app.domain.LeaseApplyInfo; import com.bonus.sgzb.base.api.domain.LeaseApplyInfo;
/** /**
* Description: * Description:
* @Author 阮世耀 * @Author 阮世耀

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java
View File

@ -1,7 +1,7 @@
package com.bonus.sgzb.app.service; package com.bonus.sgzb.app.service;
import java.util.List; import java.util.List;
import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.base.api.domain.TmTask;
/** /**
* Description: 任务表Task * Description: 任务表Task

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseApplyDetailsServiceImpl.java
View File

@ -4,7 +4,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
import com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper; import com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper;
import com.bonus.sgzb.app.domain.LeaseApplyDetails; import com.bonus.sgzb.base.api.domain.LeaseApplyDetails;
import com.bonus.sgzb.app.service.LeaseApplyDetailsService; import com.bonus.sgzb.app.service.LeaseApplyDetailsService;
/** /**
* Description: * Description:

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseApplyInfoServiceImpl.java
View File

@ -4,7 +4,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import com.bonus.sgzb.app.mapper.LeaseApplyInfoMapper; import com.bonus.sgzb.app.mapper.LeaseApplyInfoMapper;
import java.util.List; import java.util.List;
import com.bonus.sgzb.app.domain.LeaseApplyInfo; import com.bonus.sgzb.base.api.domain.LeaseApplyInfo;
import com.bonus.sgzb.app.service.LeaseApplyInfoService; import com.bonus.sgzb.app.service.LeaseApplyInfoService;
/** /**
* Description: * Description:

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -4,7 +4,7 @@ import com.bonus.sgzb.common.core.utils.DateUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.base.api.domain.TmTask;
import com.bonus.sgzb.app.mapper.TmTaskMapper; import com.bonus.sgzb.app.mapper.TmTaskMapper;
import com.bonus.sgzb.app.service.TmTaskService; import com.bonus.sgzb.app.service.TmTaskService;
/** /**

14
sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper"> <mapper namespace="com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper">
<resultMap id="BaseResultMap" type="com.bonus.sgzb.app.domain.LeaseApplyDetails"> <resultMap id="BaseResultMap" type="com.bonus.sgzb.base.api.domain.LeaseApplyDetails">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table lease_apply_details--> <!--@Table lease_apply_details-->
<id column="id" jdbcType="INTEGER" property="id" /> <id column="id" jdbcType="INTEGER" property="id" />
@ -34,7 +34,7 @@
delete from lease_apply_details delete from lease_apply_details
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</delete> </delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.app.domain.LeaseApplyDetails" useGeneratedKeys="true"> <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.base.api.domain.LeaseApplyDetails" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into lease_apply_details (parennt_id, type_id, pre_num, insert into lease_apply_details (parennt_id, type_id, pre_num,
al_num, `status`, create_by, al_num, `status`, create_by,
@ -45,7 +45,7 @@
#{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
#{remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}) #{remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER})
</insert> </insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.app.domain.LeaseApplyDetails" useGeneratedKeys="true"> <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.base.api.domain.LeaseApplyDetails" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into lease_apply_details insert into lease_apply_details
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@ -119,7 +119,7 @@
</if> </if>
</trim> </trim>
</insert> </insert>
<update id="updateByPrimaryKeySelective" parameterType="com.bonus.sgzb.app.domain.LeaseApplyDetails"> <update id="updateByPrimaryKeySelective" parameterType="com.bonus.sgzb.base.api.domain.LeaseApplyDetails">
<!--@mbg.generated--> <!--@mbg.generated-->
update lease_apply_details update lease_apply_details
<set> <set>
@ -159,7 +159,7 @@
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.bonus.sgzb.app.domain.LeaseApplyDetails"> <update id="updateByPrimaryKey" parameterType="com.bonus.sgzb.base.api.domain.LeaseApplyDetails">
<!--@mbg.generated--> <!--@mbg.generated-->
update lease_apply_details update lease_apply_details
set parennt_id = #{parenntId,jdbcType=INTEGER}, set parennt_id = #{parenntId,jdbcType=INTEGER},
@ -342,7 +342,7 @@
</foreach> </foreach>
</insert> </insert>
<insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.app.domain.LeaseApplyDetails" useGeneratedKeys="true"> <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.base.api.domain.LeaseApplyDetails" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into lease_apply_details insert into lease_apply_details
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@ -396,7 +396,7 @@
company_id = #{companyId,jdbcType=INTEGER}, company_id = #{companyId,jdbcType=INTEGER},
</trim> </trim>
</insert> </insert>
<insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.app.domain.LeaseApplyDetails" useGeneratedKeys="true"> <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.base.api.domain.LeaseApplyDetails" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into lease_apply_details insert into lease_apply_details
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">

14
sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.app.mapper.LeaseApplyInfoMapper"> <mapper namespace="com.bonus.sgzb.app.mapper.LeaseApplyInfoMapper">
<resultMap id="BaseResultMap" type="com.bonus.sgzb.app.domain.LeaseApplyInfo"> <resultMap id="BaseResultMap" type="com.bonus.sgzb.base.api.domain.LeaseApplyInfo">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table lease_apply_info--> <!--@Table lease_apply_info-->
<id column="id" jdbcType="INTEGER" property="id" /> <id column="id" jdbcType="INTEGER" property="id" />
@ -45,7 +45,7 @@
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</delete> </delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.app.domain.LeaseApplyInfo" useGeneratedKeys="true"> <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.base.api.domain.LeaseApplyInfo" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into lease_apply_info (code, task_id, lease_person, phone, insert into lease_apply_info (code, task_id, lease_person, phone,
`type`, company_audit_by, company_audit_time, `type`, company_audit_by, company_audit_time,
@ -61,7 +61,7 @@
#{companyId,jdbcType=INTEGER}) #{companyId,jdbcType=INTEGER})
</insert> </insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.app.domain.LeaseApplyInfo" useGeneratedKeys="true"> <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.base.api.domain.LeaseApplyInfo" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into lease_apply_info insert into lease_apply_info
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@ -172,7 +172,7 @@
</trim> </trim>
</insert> </insert>
<update id="updateByPrimaryKeySelective" parameterType="com.bonus.sgzb.app.domain.LeaseApplyInfo"> <update id="updateByPrimaryKeySelective" parameterType="com.bonus.sgzb.base.api.domain.LeaseApplyInfo">
<!--@mbg.generated--> <!--@mbg.generated-->
update lease_apply_info update lease_apply_info
<set> <set>
@ -228,7 +228,7 @@
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.bonus.sgzb.app.domain.LeaseApplyInfo"> <update id="updateByPrimaryKey" parameterType="com.bonus.sgzb.base.api.domain.LeaseApplyInfo">
<!--@mbg.generated--> <!--@mbg.generated-->
update lease_apply_info update lease_apply_info
set task_id = #{taskId,jdbcType=INTEGER}, set task_id = #{taskId,jdbcType=INTEGER},
@ -482,7 +482,7 @@
</foreach> </foreach>
</insert> </insert>
<insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.app.domain.LeaseApplyInfo" useGeneratedKeys="true"> <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.base.api.domain.LeaseApplyInfo" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into lease_apply_info insert into lease_apply_info
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@ -552,7 +552,7 @@
</trim> </trim>
</insert> </insert>
<insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.app.domain.LeaseApplyInfo" useGeneratedKeys="true"> <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.base.api.domain.LeaseApplyInfo" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into lease_apply_info insert into lease_apply_info
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">

14
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.app.mapper.TmTaskMapper"> <mapper namespace="com.bonus.sgzb.app.mapper.TmTaskMapper">
<resultMap id="BaseResultMap" type="com.bonus.sgzb.app.domain.TmTask"> <resultMap id="BaseResultMap" type="com.bonus.sgzb.base.api.domain.TmTask">
<!--@Table tm_task--> <!--@Table tm_task-->
<id column="task_id" jdbcType="BIGINT" property="taskId" /> <id column="task_id" jdbcType="BIGINT" property="taskId" />
<result column="task_type" jdbcType="INTEGER" property="taskType" /> <result column="task_type" jdbcType="INTEGER" property="taskType" />
@ -33,13 +33,13 @@
where task_id = #{taskId,jdbcType=BIGINT} where task_id = #{taskId,jdbcType=BIGINT}
</delete> </delete>
<insert id="insert" keyColumn="task_id" keyProperty="taskId" parameterType="com.bonus.sgzb.app.domain.TmTask" useGeneratedKeys="true"> <insert id="insert" keyColumn="task_id" keyProperty="taskId" parameterType="com.bonus.sgzb.base.api.domain.TmTask" useGeneratedKeys="true">
insert into tm_task (task_type, task_status, code, create_by, create_time, update_by, update_time, remark, company_id) insert into tm_task (task_type, task_status, code, create_by, create_time, update_by, update_time, remark, company_id)
values (#{taskType,jdbcType=INTEGER}, #{taskStatus,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, values (#{taskType,jdbcType=INTEGER}, #{taskStatus,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER}) #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER})
</insert> </insert>
<insert id="insertSelective" keyColumn="task_id" keyProperty="taskId" parameterType="com.bonus.sgzb.app.domain.TmTask" useGeneratedKeys="true"> <insert id="insertSelective" keyColumn="task_id" keyProperty="taskId" parameterType="com.bonus.sgzb.base.api.domain.TmTask" useGeneratedKeys="true">
insert into tm_task insert into tm_task
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="taskType != null"> <if test="taskType != null">
@ -101,7 +101,7 @@
</trim> </trim>
</insert> </insert>
<update id="updateByPrimaryKeySelective" parameterType="com.bonus.sgzb.app.domain.TmTask"> <update id="updateByPrimaryKeySelective" parameterType="com.bonus.sgzb.base.api.domain.TmTask">
<!--@mbg.generated--> <!--@mbg.generated-->
update tm_task update tm_task
<set> <set>
@ -136,7 +136,7 @@
where task_id = #{taskId,jdbcType=BIGINT} where task_id = #{taskId,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.bonus.sgzb.app.domain.TmTask"> <update id="updateByPrimaryKey" parameterType="com.bonus.sgzb.base.api.domain.TmTask">
<!--@mbg.generated--> <!--@mbg.generated-->
update tm_task update tm_task
set task_type = #{taskType,jdbcType=INTEGER}, set task_type = #{taskType,jdbcType=INTEGER},
@ -295,7 +295,7 @@
</foreach> </foreach>
</insert> </insert>
<insert id="insertOrUpdate" keyColumn="task_id" keyProperty="taskId" parameterType="com.bonus.sgzb.app.domain.TmTask" useGeneratedKeys="true"> <insert id="insertOrUpdate" keyColumn="task_id" keyProperty="taskId" parameterType="com.bonus.sgzb.base.api.domain.TmTask" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into tm_task insert into tm_task
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@ -344,7 +344,7 @@
</trim> </trim>
</insert> </insert>
<insert id="insertOrUpdateSelective" keyColumn="task_id" keyProperty="taskId" parameterType="com.bonus.sgzb.app.domain.TmTask" useGeneratedKeys="true"> <insert id="insertOrUpdateSelective" keyColumn="task_id" keyProperty="taskId" parameterType="com.bonus.sgzb.base.api.domain.TmTask" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into tm_task insert into tm_task
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/TmTaskController.java → sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/TaskController.java
View File

@ -3,8 +3,8 @@ package com.bonus.sgzb.material.controller;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.bonus.sgzb.material.domain.TmTask; import com.bonus.sgzb.base.api.domain.TmTask;
import com.bonus.sgzb.material.service.ITmTaskService; import com.bonus.sgzb.material.service.TaskService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -30,10 +30,10 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo;
*/ */
@RestController @RestController
@RequestMapping("/task") @RequestMapping("/task")
public class TmTaskController extends BaseController public class TaskController extends BaseController
{ {
@Autowired @Autowired
private ITmTaskService tmTaskService; private TaskService tmTaskService;
/** /**
* 查询任务tm_task列表 * 查询任务tm_task列表

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java
View File

@ -35,7 +35,7 @@ public class PurchaseCheckInfo extends BaseEntity
/** 数据所属组织 */ /** 数据所属组织 */
@ApiModelProperty(value = "数据所属组织") @ApiModelProperty(value = "数据所属组织")
private Long companyId; private Integer companyId;
@ApiModelProperty(value = "采购单号") @ApiModelProperty(value = "采购单号")
private String code; private String code;
@ -87,12 +87,12 @@ public class PurchaseCheckInfo extends BaseEntity
{ {
return purchaser; return purchaser;
} }
public void setCompanyId(Long companyId) public void setCompanyId(Integer companyId)
{ {
this.companyId = companyId; this.companyId = companyId;
} }
public Long getCompanyId() public Integer getCompanyId()
{ {
return companyId; return companyId;
} }

98
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TmTask.java
View File

@ -1,98 +0,0 @@
package com.bonus.sgzb.material.domain;
import com.bonus.sgzb.common.core.annotation.Excel;
import com.bonus.sgzb.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 任务tm_task对象 tm_task
*
* @author bonus
* @date 2023-12-13
*/
public class TmTask extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 任务ID */
private Long taskId;
/** 任务类型(定义数据字典) */
@Excel(name = "任务类型(定义数据字典)")
private Long taskType;
/** 任务状态(定义数据字典) */
@Excel(name = "任务状态(定义数据字典)")
private Long taskStatus;
/** 编号 */
@Excel(name = "编号")
private String code;
/** 数据所属组织 */
@Excel(name = "数据所属组织")
private Long companyId;
public void setTaskId(Long taskId)
{
this.taskId = taskId;
}
public Long getTaskId()
{
return taskId;
}
public void setTaskType(Long taskType)
{
this.taskType = taskType;
}
public Long getTaskType()
{
return taskType;
}
public void setTaskStatus(Long taskStatus)
{
this.taskStatus = taskStatus;
}
public Long getTaskStatus()
{
return taskStatus;
}
public void setCode(String code)
{
this.code = code;
}
public String getCode()
{
return code;
}
public void setCompanyId(Long companyId)
{
this.companyId = companyId;
}
public Long getCompanyId()
{
return companyId;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("taskId", getTaskId())
.append("taskType", getTaskType())
.append("taskStatus", getTaskStatus())
.append("code", getCode())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("companyId", getCompanyId())
.toString();
}
}

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TmTaskMapper.java → sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java
View File

@ -1,7 +1,9 @@
package com.bonus.sgzb.material.mapper; package com.bonus.sgzb.material.mapper;
import com.bonus.sgzb.base.api.domain.TmTask;
import java.util.List; import java.util.List;
import com.bonus.sgzb.material.domain.TmTask;
/** /**
* 任务tm_taskMapper接口 * 任务tm_taskMapper接口
@ -9,7 +11,7 @@ import com.bonus.sgzb.material.domain.TmTask;
* @author bonus * @author bonus
* @date 2023-12-13 * @date 2023-12-13
*/ */
public interface TmTaskMapper public interface TaskMapper
{ {
/** /**
* 查询任务tm_task * 查询任务tm_task

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ITmTaskService.java → sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/TaskService.java
View File

@ -1,6 +1,7 @@
package com.bonus.sgzb.material.service; package com.bonus.sgzb.material.service;
import com.bonus.sgzb.material.domain.TmTask;
import com.bonus.sgzb.base.api.domain.TmTask;
import java.util.List; import java.util.List;
@ -10,7 +11,7 @@ import java.util.List;
* @author bonus * @author bonus
* @date 2023-12-13 * @date 2023-12-13
*/ */
public interface ITmTaskService public interface TaskService
{ {
/** /**
* 查询任务tm_task * 查询任务tm_task

10
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -2,10 +2,10 @@ package com.bonus.sgzb.material.service.impl;
import java.util.List; import java.util.List;
import com.bonus.sgzb.base.api.domain.TmTask;
import com.bonus.sgzb.material.domain.PurchaseCheckInfo; import com.bonus.sgzb.material.domain.PurchaseCheckInfo;
import com.bonus.sgzb.material.domain.TmTask;
import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper; import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper;
import com.bonus.sgzb.material.mapper.TmTaskMapper; import com.bonus.sgzb.material.mapper.TaskMapper;
import com.bonus.sgzb.material.service.IPurchaseCheckInfoService; import com.bonus.sgzb.material.service.IPurchaseCheckInfoService;
import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.DateUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -26,7 +26,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
private PurchaseCheckInfoMapper purchaseCheckInfoMapper; private PurchaseCheckInfoMapper purchaseCheckInfoMapper;
@Resource @Resource
private TmTaskMapper taskMapper; private TaskMapper taskMapper;
/** /**
* 查询新购验收任务 * 查询新购验收任务
@ -68,8 +68,8 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
public int insertPurchaseCheckInfo(PurchaseCheckInfo purchaseCheckInfo) public int insertPurchaseCheckInfo(PurchaseCheckInfo purchaseCheckInfo)
{ {
TmTask task = new TmTask(); TmTask task = new TmTask();
task.setTaskType(14L); task.setTaskType(14);
task.setTaskStatus(24L); task.setTaskStatus(24);
task.setCode(purchaseCheckInfo.getCode()); task.setCode(purchaseCheckInfo.getCode());
task.setCompanyId(purchaseCheckInfo.getCompanyId()); task.setCompanyId(purchaseCheckInfo.getCompanyId());
taskMapper.insertTmTask(task); taskMapper.insertTmTask(task);

11
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TmTaskServiceImpl.java → sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/TaskServiceImpl.java
View File

@ -1,12 +1,13 @@
package com.bonus.sgzb.material.service.impl; package com.bonus.sgzb.material.service.impl;
import java.util.List; import java.util.List;
import com.bonus.sgzb.base.api.domain.TmTask;
import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.bonus.sgzb.material.mapper.TmTaskMapper; import com.bonus.sgzb.material.mapper.TaskMapper;
import com.bonus.sgzb.material.domain.TmTask; import com.bonus.sgzb.material.service.TaskService;
import com.bonus.sgzb.material.service.ITmTaskService;
/** /**
* 任务tm_taskService业务层处理 * 任务tm_taskService业务层处理
@ -15,10 +16,10 @@ import com.bonus.sgzb.material.service.ITmTaskService;
* @date 2023-12-13 * @date 2023-12-13
*/ */
@Service @Service
public class TmTaskServiceImpl implements ITmTaskService public class TaskServiceImpl implements TaskService
{ {
@Autowired @Autowired
private TmTaskMapper tmTaskMapper; private TaskMapper tmTaskMapper;
/** /**
* 查询任务tm_task * 查询任务tm_task

10
sgzb-modules/sgzb-material/src/main/resources/mapper/material/TmTaskMapper.xml → sgzb-modules/sgzb-material/src/main/resources/mapper/material/TaskMapper.xml
View File

@ -2,9 +2,9 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.material.mapper.TmTaskMapper"> <mapper namespace="com.bonus.sgzb.material.mapper.TaskMapper">
<resultMap type="com.bonus.sgzb.material.domain.TmTask" id="TmTaskResult"> <resultMap type="com.bonus.sgzb.base.api.domain.TmTask" id="TmTaskResult">
<result property="taskId" column="task_id" /> <result property="taskId" column="task_id" />
<result property="taskType" column="task_type" /> <result property="taskType" column="task_type" />
<result property="taskStatus" column="task_status" /> <result property="taskStatus" column="task_status" />
@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select task_id, task_type, task_status, code, create_by, create_time, update_by, update_time, remark, company_id from tm_task select task_id, task_type, task_status, code, create_by, create_time, update_by, update_time, remark, company_id from tm_task
</sql> </sql>
<select id="selectTmTaskList" parameterType="com.bonus.sgzb.material.domain.TmTask" resultMap="TmTaskResult"> <select id="selectTmTaskList" parameterType="com.bonus.sgzb.base.api.domain.TmTask" resultMap="TmTaskResult">
<include refid="selectTmTaskVo"/> <include refid="selectTmTaskVo"/>
<where> <where>
<if test="taskType != null "> and task_type = #{taskType}</if> <if test="taskType != null "> and task_type = #{taskType}</if>
@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where task_id = #{taskId} where task_id = #{taskId}
</select> </select>
<insert id="insertTmTask" parameterType="com.bonus.sgzb.material.domain.TmTask" useGeneratedKeys="true" keyProperty="taskId"> <insert id="insertTmTask" parameterType="com.bonus.sgzb.base.api.domain.TmTask" useGeneratedKeys="true" keyProperty="taskId">
insert into tm_task insert into tm_task
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="taskType != null">task_type,</if> <if test="taskType != null">task_type,</if>
@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
</insert> </insert>
<update id="updateTmTask" parameterType="com.bonus.sgzb.material.domain.TmTask"> <update id="updateTmTask" parameterType="com.bonus.sgzb.base.api.domain.TmTask">
update tm_task update tm_task
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="taskType != null">task_type = #{taskType},</if> <if test="taskType != null">task_type = #{taskType},</if>