添加节点类型、标签等

xm-core/src/main/java/com/xm/core/entity/XmProduct.java

@@ -8,9 +8,9 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmProduct所有属性名: <br>
- *	id,productName,branchId,remark,version,pmUserid,pmUsername,ctime,deptid,pstatus,startTime,endTime,deptName,admUserid,admUsername,assUserid,assUsername,bizProcInstId,bizFlowState,isTpl,baselineId,baseTime,code,pbudgetWorkload,pbudgetAmount,pmenuBudgetWorkload,pmenuBudgetAmount,budgetCtrl,phaseBudgetCtrl,phaseActCtrl;<br>
+ *	id,productName,branchId,remark,version,pmUserid,pmUsername,ctime,deptid,pstatus,startTime,endTime,deptName,admUserid,admUsername,assUserid,assUsername,bizProcInstId,bizFlowState,isTpl,baselineId,baseTime,code,pbudgetWorkload,pbudgetAmount,pmenuBudgetWorkload,pmenuBudgetAmount,budgetCtrl,phaseBudgetCtrl,phaseActCtrl,locked,del,ltime;<br>
  * 表 xm_product 产品表的所有字段名: <br>
- *	id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid,pstatus,start_time,end_time,dept_name,adm_userid,adm_username,ass_userid,ass_username,biz_proc_inst_id,biz_flow_state,is_tpl,baseline_id,base_time,code,pbudget_workload,pbudget_amount,pmenu_budget_workload,pmenu_budget_amount,budget_ctrl,phase_budget_ctrl,phase_act_ctrl;<br>
+ *	id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid,pstatus,start_time,end_time,dept_name,adm_userid,adm_username,ass_userid,ass_username,biz_proc_inst_id,biz_flow_state,is_tpl,baseline_id,base_time,code,pbudget_workload,pbudget_amount,pmenu_budget_workload,pmenu_budget_amount,budget_ctrl,phase_budget_ctrl,phase_act_ctrl,locked,del,ltime;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -110,6 +110,15 @@ public class XmProduct  implements java.io.Serializable {
 	@ApiModelProperty(notes="计划是否进行实际金额控制，实际金额不能大于预算金额",allowEmptyValue=true,example="",allowableValues="")
 	String phaseActCtrl;
 	
+	@ApiModelProperty(notes="是否锁定不允许编号0否1是",allowEmptyValue=true,example="",allowableValues="")
+	String locked;
+	
+	@ApiModelProperty(notes="是否已删除0否一是",allowEmptyValue=true,example="",allowableValues="")
+	String del;
+	
+	@ApiModelProperty(notes="最后更新时间",allowEmptyValue=true,example="",allowableValues="")
+	Date ltime;
+
 	/**产品编号**/
 	public XmProduct(String id) {
 		this.id = id;
@@ -299,6 +308,24 @@ public class XmProduct  implements java.io.Serializable {
 	public void setPhaseActCtrl(String phaseActCtrl) {
 		this.phaseActCtrl = phaseActCtrl;
 	}
+	/**
+	 * 是否锁定不允许编号0否1是
+	 **/
+	public void setLocked(String locked) {
+		this.locked = locked;
+	}
+	/**
+	 * 是否已删除0否一是
+	 **/
+	public void setDel(String del) {
+		this.del = del;
+	}
+	/**
+	 * 最后更新时间
+	 **/
+	public void setLtime(Date ltime) {
+		this.ltime = ltime;
+	}
 	
 	/**
 	 * 产品编号
@@ -480,5 +507,23 @@ public class XmProduct  implements java.io.Serializable {
 	public String getPhaseActCtrl() {
 		return this.phaseActCtrl;
 	}
+	/**
+	 * 是否锁定不允许编号0否1是
+	 **/
+	public String getLocked() {
+		return this.locked;
+	}
+	/**
+	 * 是否已删除0否一是
+	 **/
+	public String getDel() {
+		return this.del;
+	}
+	/**
+	 * 最后更新时间
+	 **/
+	public Date getLtime() {
+		return this.ltime;
+	}
 
 }

xm-core/src/main/java/com/xm/core/entity/XmProject.java

@@ -8,9 +8,9 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmProject所有属性名: <br>
- *	id,code,name,xmType,startTime,endTime,urgent,priority,description,createUserid,createUsername,createTime,assess,assessRemarks,status,branchId,planTotalCost,bizProcInstId,bizFlowState,planNouserAt,planInnerUserAt,planOutUserAt,locked,baseTime,baseRemark,baselineId,planWorkload,totalReceivables,budgetMarginRate,contractAmt,planInnerUserPrice,planOutUserPrice,planOutUserCnt,planInnerUserCnt,planWorkingHours,taxRate,planInnerUserWorkload,planOutUserWorkload,fromTplId,budgetCtrl,deptid,showOut,isTpl,pmUserid,pmUsername,assUserid,assUsername,admUserid,admUsername,phaseBudgetCtrl,phaseActCtrl;<br>
+ *	id,code,name,xmType,startTime,endTime,urgent,priority,description,createUserid,createUsername,createTime,assess,assessRemarks,status,branchId,planTotalCost,bizProcInstId,bizFlowState,planNouserAt,planInnerUserAt,planOutUserAt,locked,baseTime,baseRemark,baselineId,planWorkload,totalReceivables,budgetMarginRate,contractAmt,planInnerUserPrice,planOutUserPrice,planOutUserCnt,planInnerUserCnt,planWorkingHours,taxRate,planInnerUserWorkload,planOutUserWorkload,fromTplId,budgetCtrl,deptid,showOut,isTpl,pmUserid,pmUsername,assUserid,assUsername,admUserid,admUsername,phaseBudgetCtrl,phaseActCtrl,del,ltime;<br>
  * 表 xm_project xm_project的所有字段名: <br>
- *	id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username,phase_budget_ctrl,phase_act_ctrl;<br>
+ *	id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username,phase_budget_ctrl,phase_act_ctrl,del,ltime;<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -125,7 +125,7 @@ public class XmProject  implements java.io.Serializable {
 	@ApiModelProperty(notes="预计工作小时数目",allowEmptyValue=true,example="",allowableValues="")
 	Integer planWorkingHours;
 	
-	@ApiModelProperty(notes="税率",allowEmptyValue=true,example="",allowableValues="")
+	@ApiModelProperty(notes="税率0-100之间",allowEmptyValue=true,example="",allowableValues="")
 	BigDecimal taxRate;
 	
 	@ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="")
@@ -173,6 +173,12 @@ public class XmProject  implements java.io.Serializable {
 	@ApiModelProperty(notes="计划是否进行实际金额控制，实际金额不能大于预算金额",allowEmptyValue=true,example="",allowableValues="")
 	String phaseActCtrl;
 	
+	@ApiModelProperty(notes="是否已删除0否1是",allowEmptyValue=true,example="",allowableValues="")
+	String del;
+	
+	@ApiModelProperty(notes="最后更新时间",allowEmptyValue=true,example="",allowableValues="")
+	Date ltime;
+
 	/**项目编号**/
 	public XmProject(String id) {
 		this.id = id;
@@ -393,7 +399,7 @@ public class XmProject  implements java.io.Serializable {
 		this.planWorkingHours = planWorkingHours;
 	}
 	/**
-	 * 税率
+	 * 税率0-100之间
 	 **/
 	public void setTaxRate(BigDecimal taxRate) {
 		this.taxRate = taxRate;
@@ -488,6 +494,18 @@ public class XmProject  implements java.io.Serializable {
 	public void setPhaseActCtrl(String phaseActCtrl) {
 		this.phaseActCtrl = phaseActCtrl;
 	}
+	/**
+	 * 是否已删除0否1是
+	 **/
+	public void setDel(String del) {
+		this.del = del;
+	}
+	/**
+	 * 最后更新时间
+	 **/
+	public void setLtime(Date ltime) {
+		this.ltime = ltime;
+	}
 	
 	/**
 	 * 项目编号
@@ -700,7 +718,7 @@ public class XmProject  implements java.io.Serializable {
 		return this.planWorkingHours;
 	}
 	/**
-	 * 税率
+	 * 税率0-100之间
 	 **/
 	public BigDecimal getTaxRate() {
 		return this.taxRate;
@@ -795,5 +813,17 @@ public class XmProject  implements java.io.Serializable {
 	public String getPhaseActCtrl() {
 		return this.phaseActCtrl;
 	}
+	/**
+	 * 是否已删除0否1是
+	 **/
+	public String getDel() {
+		return this.del;
+	}
+	/**
+	 * 最后更新时间
+	 **/
+	public Date getLtime() {
+		return this.ltime;
+	}
 
 }

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml

@@ -87,7 +87,13 @@
 		where 
 			res.id = #{id}
 	</select>
-	
+    <select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmProduct">
+        select * from xm_product res
+        where  (res.id) in
+             <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
+                 ( #{item})
+             </foreach>
+    </select>
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
 		select * from xm_product res
@@ -106,7 +112,7 @@
 		insert into xm_product(
 			<include refid="columns"/>
 		) values (
-		#{id},#{productName},#{branchId},#{remark},#{version},#{pmUserid},#{pmUsername},#{ctime},#{deptid},#{pstatus},#{startTime},#{endTime},#{deptName},#{admUserid},#{admUsername},#{assUserid},#{assUsername},#{bizProcInstId},#{bizFlowState},#{isTpl},#{baselineId},#{baseTime},#{code},#{pbudgetWorkload},#{pbudgetAmount},#{pmenuBudgetWorkload},#{pmenuBudgetAmount},#{budgetCtrl},#{phaseBudgetCtrl},#{phaseActCtrl}
+		#{id},#{productName},#{branchId},#{remark},#{version},#{pmUserid},#{pmUsername},#{ctime},#{deptid},#{pstatus},#{startTime},#{endTime},#{deptName},#{admUserid},#{admUsername},#{assUserid},#{assUsername},#{bizProcInstId},#{bizFlowState},#{isTpl},#{baselineId},#{baseTime},#{code},#{pbudgetWorkload},#{pbudgetAmount},#{pmenuBudgetWorkload},#{pmenuBudgetAmount},#{budgetCtrl},#{phaseBudgetCtrl},#{phaseActCtrl},#{locked},#{del},#{ltime}
 		)
 	</insert>
 	
@@ -169,7 +175,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid,pstatus,start_time,end_time,dept_name,adm_userid,adm_username,ass_userid,ass_username,biz_proc_inst_id,biz_flow_state,is_tpl,baseline_id,base_time,code,pbudget_workload,pbudget_amount,pmenu_budget_workload,pmenu_budget_amount,budget_ctrl,phase_budget_ctrl,phase_act_ctrl
+		id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid,pstatus,start_time,end_time,dept_name,adm_userid,adm_username,ass_userid,ass_username,biz_proc_inst_id,biz_flow_state,is_tpl,baseline_id,base_time,code,pbudget_workload,pbudget_amount,pmenu_budget_workload,pmenu_budget_amount,budget_ctrl,phase_budget_ctrl,phase_act_ctrl,locked,del,ltime
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -204,6 +210,9 @@
 		<if test="budgetCtrl != null and budgetCtrl != ''">      and res.budget_ctrl = #{budgetCtrl}     </if>
 		<if test="phaseBudgetCtrl != null and phaseBudgetCtrl != ''">      and res.phase_budget_ctrl = #{phaseBudgetCtrl}     </if>
 		<if test="phaseActCtrl != null and phaseActCtrl != ''">      and res.phase_act_ctrl = #{phaseActCtrl}     </if>
+		<if test="locked != null and locked != ''">      and res.locked = #{locked}     </if>
+		<if test="del != null and del != ''">      and res.del = #{del}     </if>
+		<if test="ltime != null">      and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d')     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -235,7 +244,10 @@
 		pmenu_budget_amount = #{pmenuBudgetAmount},
 		budget_ctrl = #{budgetCtrl},
 		phase_budget_ctrl = #{phaseBudgetCtrl},
-		phase_act_ctrl = #{phaseActCtrl}
+		phase_act_ctrl = #{phaseActCtrl},
+		locked = #{locked},
+		del = #{del},
+		ltime = #{ltime}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="productName != null and productName != ''"> product_name = #{productName},     </if>
@@ -267,6 +279,9 @@
 		<if test="budgetCtrl != null and budgetCtrl != ''"> budget_ctrl = #{budgetCtrl},     </if>
 		<if test="phaseBudgetCtrl != null and phaseBudgetCtrl != ''"> phase_budget_ctrl = #{phaseBudgetCtrl},     </if>
 		<if test="phaseActCtrl != null and phaseActCtrl != ''"> phase_act_ctrl = #{phaseActCtrl},     </if>
+		<if test="locked != null and locked != ''"> locked = #{locked},     </if>
+		<if test="del != null and del != ''"> del = #{del},     </if>
+		<if test="ltime != null"> ltime = #{ltime},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -298,6 +313,9 @@
 			pmenu_budget_amount = #{item.pmenuBudgetAmount},
 			budget_ctrl = #{item.budgetCtrl},
 			phase_budget_ctrl = #{item.phaseBudgetCtrl},
-			phase_act_ctrl = #{item.phaseActCtrl}
+			phase_act_ctrl = #{item.phaseActCtrl},
+			locked = #{item.locked},
+			del = #{item.del},
+			ltime = #{item.ltime}
 	</sql>
 </mapper>

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml

@@ -144,7 +144,13 @@
 		where 
 			res.id = #{id}
 	</select>
-	
+    <select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmProject">
+        select * from xm_project res
+        where  (res.id) in
+             <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
+                 ( #{item})
+             </foreach>
+    </select>
 	<!-- 通过主键查询获取数据对象 返回map-->
 	<select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
 		select * from xm_project res
@@ -163,7 +169,7 @@
 		insert into xm_project(
 			<include refid="columns"/>
 		) values (
-		#{id},#{code},#{name},#{xmType},#{startTime},#{endTime},#{urgent},#{priority},#{description},#{createUserid},#{createUsername},#{createTime},#{assess},#{assessRemarks},#{status},#{branchId},#{planTotalCost},#{bizProcInstId},#{bizFlowState},#{planNouserAt},#{planInnerUserAt},#{planOutUserAt},#{locked},#{baseTime},#{baseRemark},#{baselineId},#{planWorkload},#{totalReceivables},#{budgetMarginRate},#{contractAmt},#{planInnerUserPrice},#{planOutUserPrice},#{planOutUserCnt},#{planInnerUserCnt},#{planWorkingHours},#{taxRate},#{planInnerUserWorkload},#{planOutUserWorkload},#{fromTplId},#{budgetCtrl},#{deptid},#{showOut},#{isTpl},#{pmUserid},#{pmUsername},#{assUserid},#{assUsername},#{admUserid},#{admUsername},#{phaseBudgetCtrl},#{phaseActCtrl}
+		#{id},#{code},#{name},#{xmType},#{startTime},#{endTime},#{urgent},#{priority},#{description},#{createUserid},#{createUsername},#{createTime},#{assess},#{assessRemarks},#{status},#{branchId},#{planTotalCost},#{bizProcInstId},#{bizFlowState},#{planNouserAt},#{planInnerUserAt},#{planOutUserAt},#{locked},#{baseTime},#{baseRemark},#{baselineId},#{planWorkload},#{totalReceivables},#{budgetMarginRate},#{contractAmt},#{planInnerUserPrice},#{planOutUserPrice},#{planOutUserCnt},#{planInnerUserCnt},#{planWorkingHours},#{taxRate},#{planInnerUserWorkload},#{planOutUserWorkload},#{fromTplId},#{budgetCtrl},#{deptid},#{showOut},#{isTpl},#{pmUserid},#{pmUsername},#{assUserid},#{assUsername},#{admUserid},#{admUsername},#{phaseBudgetCtrl},#{phaseActCtrl},#{del},#{ltime}
 		)
 	</insert>
 	
@@ -226,7 +232,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username,phase_budget_ctrl,phase_act_ctrl
+		id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username,phase_budget_ctrl,phase_act_ctrl,del,ltime
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -282,6 +288,8 @@
 		<if test="admUsername != null and admUsername != ''">      and res.adm_username = #{admUsername}     </if>
 		<if test="phaseBudgetCtrl != null and phaseBudgetCtrl != ''">      and res.phase_budget_ctrl = #{phaseBudgetCtrl}     </if>
 		<if test="phaseActCtrl != null and phaseActCtrl != ''">      and res.phase_act_ctrl = #{phaseActCtrl}     </if>
+		<if test="del != null and del != ''">      and res.del = #{del}     </if>
+		<if test="ltime != null">      and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d')     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -334,7 +342,9 @@
 		adm_userid = #{admUserid},
 		adm_username = #{admUsername},
 		phase_budget_ctrl = #{phaseBudgetCtrl},
-		phase_act_ctrl = #{phaseActCtrl}
+		phase_act_ctrl = #{phaseActCtrl},
+		del = #{del},
+		ltime = #{ltime}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="code != null and code != ''"> code = #{code},     </if>
@@ -387,6 +397,8 @@
 		<if test="admUsername != null and admUsername != ''"> adm_username = #{admUsername},     </if>
 		<if test="phaseBudgetCtrl != null and phaseBudgetCtrl != ''"> phase_budget_ctrl = #{phaseBudgetCtrl},     </if>
 		<if test="phaseActCtrl != null and phaseActCtrl != ''"> phase_act_ctrl = #{phaseActCtrl},     </if>
+		<if test="del != null and del != ''"> del = #{del},     </if>
+		<if test="ltime != null"> ltime = #{ltime},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -439,6 +451,8 @@
 			adm_userid = #{item.admUserid},
 			adm_username = #{item.admUsername},
 			phase_budget_ctrl = #{item.phaseBudgetCtrl},
-			phase_act_ctrl = #{item.phaseActCtrl}
+			phase_act_ctrl = #{item.phaseActCtrl},
+			del = #{item.del},
+			ltime = #{item.ltime}
 	</sql>
 </mapper>