anderx 1 год назад
Родитель
Сommit
844480dd05

+ 73 - 9
src/main/java/com/goafanti/common/dao/TChangeTaskMapper.java

@@ -1,27 +1,87 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TChangeTask;
-import com.goafanti.common.model.TChangeTaskExample;
 import com.goafanti.order.bo.TChangeTaskOut;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Pageable;
 
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
+/**
+ * 变更任务表(TChangeTask)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-01-07 10:29:38
+ */
 public interface TChangeTaskMapper {
-    int deleteByPrimaryKey(Integer id);
 
-    int insert(TChangeTask record);
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    TChangeTask selectById(Integer id);
 
-    int insertSelective(TChangeTask record);
+    
 
-    TChangeTask selectByPrimaryKey(Integer id);
+    /**
+     * 查询指定行数据
+     *
+     * @param tChangeTask 查询条件
+     * @param pageable         分页对象
+     * @return 对象列表
+     */
+    List<TChangeTask> findTChangeTaskList(TChangeTask tChangeTask, @Param("pageable") Pageable pageable);
 
-    int updateByPrimaryKeySelective(TChangeTask record);
+    /**
+     * 统计总行数
+     *
+     * @param tChangeTask 查询条件
+     * @return 总行数
+     */
+    int findTChangeTaskCount(TChangeTask tChangeTask);
 
-    int updateByPrimaryKey(TChangeTask record);
+    /**
+     * 新增数据
+     *
+     * @param tChangeTask 实例对象
+     * @return 影响行数
+     */
+    int insert(TChangeTask tChangeTask);
 
+    /**
+     * 批量新增数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<TChangeTask> 实例对象列表
+     * @return 影响行数
+     */
+    int insertBatch(@Param("entities") List<TChangeTask> entities);
+
+    /**
+     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<TChangeTask> 实例对象列表
+     * @return 影响行数
+     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
+     */
+    int insertOrUpdateBatch(@Param("entities") List<TChangeTask> entities);
 
-    void insertSelectiveList(@Param("list")List<TChangeTask> list);
+    /**
+     * 修改数据
+     *
+     * @param tChangeTask 实例对象
+     * @return 影响行数
+     */
+    int update(TChangeTask tChangeTask);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Integer id);
 
     List<TChangeTaskOut> selectByCid(@Param("id")Integer id, @Param("splitStatus")Integer splitStatus);
 
@@ -58,4 +118,8 @@ public interface TChangeTaskMapper {
     void updateChangeSuperServiceYear(TChangeTask tChangeTask);
 
 
+
+    void insertSelective(TChangeTask t);
 }
+
+

Разница между файлами не показана из-за своего большого размера
+ 690 - 476
src/main/java/com/goafanti/common/mapper/TChangeTaskMapper.xml


+ 144 - 57
src/main/java/com/goafanti/common/model/TChangeTask.java

@@ -4,147 +4,160 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+
 /**
- * t_change_task
- * @author 
+ * 变更任务表(TChangeTask)实体类
+ *
+ * @author makejava
+ * @since 2025-01-07 10:29:38
  */
 public class TChangeTask implements Serializable {
-    /**
+    private static final long serialVersionUID = -85255234572445566L;
+/**
      * 任务编号
      */
     private Integer id;
-
-    /**
+/**
      * 订单任务编号
      */
     private Integer tid;
-
-    /**
+/**
      * 变更编号
      */
     private Integer cid;
-
-    /**
+/**
      * 订单编号
      */
     private String orderNo;
-
-    /**
+/**
      * 是否为主要任务 0-否,1-是
      */
     private Integer main;
-
-    /**
+/**
      * 商品id
      */
     private String commodityId;
-
-    /**
+/**
      * 商品名称(冗余)
      */
     private String commodityName;
-
-    /**
+/**
      * 商品数量
      */
     private Integer commodityQuantity;
-
-    /**
+/**
      * 合同商品价格
      */
     private BigDecimal commodityPrice;
-
-    /**
+/**
      * 任务说明
      */
     private String taskComment;
-
-    /**
+/**
      * 状态 0正常 1新增 2修改 3删除 
      */
     private Integer type;
-
-    /**
+/**
      * 创建时间
      */
     private Date createTime;
-
-    /**
+/**
      * 0否 1父拆分 2子拆分
      */
     private Integer splitStatus;
-
-    /**
+/**
      * 拆分父id
      */
     private Integer splitSuper;
-
-    /**
+/**
      * 负责人
      */
     private String receiverName;
-
-    /**
+/**
      * 官费 0否 1有
      */
     private Integer officialCost;
-
-    /**
+/**
      * 费减 0否 1有 
      */
     private Integer costReduction;
-
-    /**
+/**
      * 服务年限
      */
     private String serviceLife;
-
-    /**
+/**
      * 本次年份
      */
     private String serviceYear;
-
-    /**
+/**
      * 服务年限计数
      */
     private Integer yearSum;
-
-    /**
+/**
      * 合同期限
      */
     private String contractTerm;
-
-    /**
+/**
      * 申报批次
      */
     private Integer declarationBatch;
-
-    /**
+/**
      * 专利分类 0申请 1变更 2复审 3优先权 4恢复请求权 5无效宣告请求费 6强制许可请求费 7 强制许可使用裁决请求费 8登录、印刷费、印花税
      */
     private Integer patentType;
-
-    /**
+/**
      * 变更拆分父id
      */
     private Integer changeSplitSuper;
-
-    /**
+/**
      * 上年度年份
      */
     private String lastYear;
-
-    /**
+/**
      * 上年度总资本
      */
     private BigDecimal lastYearCapital;
-
-    /**
+/**
      * 上年度总收入
      */
     private BigDecimal lastYearIncome;
+/**
+     * 高新会员 0=否,1=是
+     */
+    private Integer htMember;
+/**
+     * 加急扣除 0=否,1=是
+     */
+    private Integer additionalDeduction;
+/**
+     * 研发奖补 0=否,1=是
+     */
+    private Integer rdAwardsubsidy;
+/**
+     * 仅做报表,不出备查资料 0=否,1=是
+     */
+    private Integer justForms;
+/**
+     * 科技项目等级 0=简易项目,1=市区级,2=省级,3=国家级
+     */
+    private Integer technologyProjectType;
+/**
+     * 申请类型 0=普通申请,1=风险代理
+     */
+    private Integer ordinaryRisk;
+/**
+     * 天数 0=普通,1=加急
+     */
+    private Integer days;
+/**
+     * 方案 0=无,1=有
+     */
+    private Integer scheme;
+/**
+     * 仅提供单边会员服务 0=否,1=是
+     */
+    private Integer unilateralService;
 
-    private static final long serialVersionUID = 1L;
 
     public Integer getId() {
         return id;
@@ -361,4 +374,78 @@ public class TChangeTask implements Serializable {
     public void setLastYearIncome(BigDecimal lastYearIncome) {
         this.lastYearIncome = lastYearIncome;
     }
-}
+
+    public Integer getHtMember() {
+        return htMember;
+    }
+
+    public void setHtMember(Integer htMember) {
+        this.htMember = htMember;
+    }
+
+    public Integer getAdditionalDeduction() {
+        return additionalDeduction;
+    }
+
+    public void setAdditionalDeduction(Integer additionalDeduction) {
+        this.additionalDeduction = additionalDeduction;
+    }
+
+    public Integer getRdAwardsubsidy() {
+        return rdAwardsubsidy;
+    }
+
+    public void setRdAwardsubsidy(Integer rdAwardsubsidy) {
+        this.rdAwardsubsidy = rdAwardsubsidy;
+    }
+
+    public Integer getJustForms() {
+        return justForms;
+    }
+
+    public void setJustForms(Integer justForms) {
+        this.justForms = justForms;
+    }
+
+    public Integer getTechnologyProjectType() {
+        return technologyProjectType;
+    }
+
+    public void setTechnologyProjectType(Integer technologyProjectType) {
+        this.technologyProjectType = technologyProjectType;
+    }
+
+    public Integer getOrdinaryRisk() {
+        return ordinaryRisk;
+    }
+
+    public void setOrdinaryRisk(Integer ordinaryRisk) {
+        this.ordinaryRisk = ordinaryRisk;
+    }
+
+    public Integer getDays() {
+        return days;
+    }
+
+    public void setDays(Integer days) {
+        this.days = days;
+    }
+
+    public Integer getScheme() {
+        return scheme;
+    }
+
+    public void setScheme(Integer scheme) {
+        this.scheme = scheme;
+    }
+
+    public Integer getUnilateralService() {
+        return unilateralService;
+    }
+
+    public void setUnilateralService(Integer unilateralService) {
+        this.unilateralService = unilateralService;
+    }
+
+}
+

+ 16 - 16
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -167,7 +167,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				if(tt.getLastYearIncome()!=null)	ck.setLastYearIncome(tt.getLastYearIncome());
 				listck.add(ck);
 			}
-			tChangeTaskMapper.insertSelectiveList(listck);
+			tChangeTaskMapper.insertBatch(listck);
 		}
 	//处理中间表数据
 		tOrderMidMapper.updateMid(t.getOrderNo());
@@ -1173,7 +1173,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						}else{
 							tid=input.get(cd.getChangeSplitSuper());
 						}
-						if (tid==null)tid=tChangeTaskMapper.selectByPrimaryKey(cd.getChangeSplitSuper()).getTid();
+						if (tid==null)tid=tChangeTaskMapper.selectById(cd.getChangeSplitSuper()).getTid();
 						ot.setSplitSuper(tid);
 					}
 					ot.setSplitId(pushSplitId(ot.getSplitSuper()));
@@ -1198,7 +1198,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				}
 				orderNewService.addTTaskMember(ot.getId(),cd.getServiceLife(),cd.getServiceYear(),cd.getYearSum(),cd.getContractTerm());
 				cd.setTid(ot.getId());
-				tChangeTaskMapper.updateByPrimaryKeySelective(cd);
+				tChangeTaskMapper.update(cd);
 				tChangeDunMapper.updateByCTid(cd.getId(), ot.getId());
 			}else if (cd.getType()==2) {
 				ot.setId(cd.getTid());
@@ -1387,7 +1387,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 			@Override
 			public int deleteChangeTask(Integer id) {
-				return tChangeTaskMapper.deleteByPrimaryKey(id);
+				return tChangeTaskMapper.deleteById(id);
 			}
 
 			@Override
@@ -1422,7 +1422,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				//有tid是订单复制项目
 				if(t.getTid()!=null) {
 					//type 0正常 1新增 2修改 3删除
-					TChangeTask tt=tChangeTaskMapper.selectByPrimaryKey(t.getId());
+					TChangeTask tt=tChangeTaskMapper.selectById(t.getId());
 					BusinessProject bp = businessProjectMapper.selectById(tt.getCommodityId());
 					Integer member=null;
 					if (t.getType()==3) {
@@ -1470,12 +1470,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					//如果没有tid是新增项目则直接删除
 				}else {
 					if (t.getType()==3) {
-						tChangeTaskMapper.deleteByPrimaryKey(t.getId());
+						tChangeTaskMapper.deleteById(t.getId());
 						tChangeTaskMapper.deleteByChangeSplitSuper(t.getId());
 						tChangeDunMapper.deleteByCtid(t.getId());
 					}
 				}
-				return tChangeTaskMapper.updateByPrimaryKeySelective(t);
+				return tChangeTaskMapper.update(t);
 			}
 
 	private void updateChangeType(TChangeTask t) {
@@ -1612,11 +1612,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Override
 	public Object addMemberSonProject(Integer id, String serviceYear, String taskComment) {
 		//先修改父项目
-		TChangeTask tChangeTask = tChangeTaskMapper.selectByPrimaryKey(id);
+		TChangeTask tChangeTask = tChangeTaskMapper.selectById(id);
 		Integer tid=tChangeTask.getTid();
 		tChangeTask.setSplitStatus(1);
 		if (tChangeTask.getType()!=1)tChangeTask.setType(2);
-		tChangeTaskMapper.updateByPrimaryKey(tChangeTask);
+		tChangeTaskMapper.update(tChangeTask);
 		//在判断是否有删除的年份没有就新增
 		tChangeTask.setId(null);
 		tChangeTask.setTid(null);
@@ -1647,14 +1647,14 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 	@Override
 	public int deleteMemberSonProject(Integer id) {
-		TChangeTask tChangeTask = tChangeTaskMapper.selectByPrimaryKey(id);
+		TChangeTask tChangeTask = tChangeTaskMapper.selectById(id);
 		if (tChangeTask.getType()==1){
-			tChangeTaskMapper.deleteByPrimaryKey(id);
+			tChangeTaskMapper.deleteById(id);
 		}else {
 			TChangeTask newtChangeTask = new TChangeTask();
 			newtChangeTask.setId(id);
 			newtChangeTask.setType(3);
-			tChangeTaskMapper.updateByPrimaryKeySelective(newtChangeTask);
+			tChangeTaskMapper.update(newtChangeTask);
 
 		}
 		List<TChangeTask> tChangeTasks = getChangeSonTasks(tChangeTask);
@@ -1663,7 +1663,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			TChangeTask changeTask = new TChangeTask();
 			changeTask.setId(tChangeTask.getSplitSuper());
 			changeTask.setSplitStatus(0);
-			tChangeTaskMapper.updateByPrimaryKeySelective(changeTask);
+			tChangeTaskMapper.update(changeTask);
 		}
 		updateSuperServiceYear(tChangeTask);
 		return 1;
@@ -1671,10 +1671,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 	@Override
 	public Object updateMemberSonProject(Integer id,String taskComment) {
-		TChangeTask tChangeTask = tChangeTaskMapper.selectByPrimaryKey(id);
+		TChangeTask tChangeTask = tChangeTaskMapper.selectById(id);
 		tChangeTask.setType(2);
 		tChangeTask.setTaskComment(taskComment);
-		tChangeTaskMapper.updateByPrimaryKeySelective(tChangeTask);
+		tChangeTaskMapper.update(tChangeTask);
 		updateSuperServiceYear(tChangeTask);
 		return tChangeTask;
 	}
@@ -1717,7 +1717,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			int i=0;
 		if (t.getMain()==1){
 			if (t.getId()!=null) {
-				TChangeTask tChangeTask = tChangeTaskMapper.selectByPrimaryKey(t.getId());
+				TChangeTask tChangeTask = tChangeTaskMapper.selectById(t.getId());
 				t.setCid(tChangeTask.getCid());
 			}
 			List<TChangeTaskOut> l = tChangeTaskMapper.selectByCid(t.getCid(), null);