lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcTorqueConfigController.java
@@ -37,7 +37,6 @@ /** * 根据id查询 * * @param id * @return */ @@ -52,7 +51,6 @@ /** * 新增 * * @param mdcTorqueConfig * @return */ @@ -66,7 +64,6 @@ /** * 修改 * * @param mdcTorqueConfig * @return */ @@ -80,7 +77,6 @@ /** * 根据id删除扭矩配置 * * @param id * @return */ @@ -94,7 +90,6 @@ /** * 批量删除 * * @param ids * @return */ @@ -109,7 +104,6 @@ /** * 导出excel * * @param request * @param mdcTorqueConfig * @return @@ -121,7 +115,6 @@ /** * 导入excel * * @param request * @param response * @return @@ -133,7 +126,6 @@ /** * 根据扭矩值生成主轴运行曲线 * * @param torqueValue * @return */ lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
@@ -57,7 +57,7 @@ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "日期") private Date date; private Date torqueDate; /** * 扭矩值 @@ -76,7 +76,7 @@ /** * 创建时间 */ @JsonFormat(timezone = "GMY+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") private Date createTime; @@ -91,7 +91,7 @@ /** * 更新时间 */ @JsonFormat(timezone = "GMY+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("更新时间") private Date updateTime; lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcTorqueConfigMapper.java
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcTorqueConfigMapper.xml
@@ -5,6 +5,7 @@ <select id="findSpindleRunningCurve" resultType="org.jeecg.modules.mdc.entity.MdcTorqueConfig"> select mtc.* from mdc_torque_config mtc where mtc.torque_value=#{torqueValue} and mtc.equipment_id=#{equipmentId} </select> <!--根据车间层级查询扭矩配置列表--> <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcTorqueConfig"> select mtc.* from mdc_torque_config mtc,mdc_equipment me where mtc.equipment_id=me.equipment_id <if test="mdcTorqueConfig.equipmentName !=null and mdcTorqueConfig.equipmentName !='' "> @@ -15,7 +16,8 @@ </if> <if test="mdcTorqueConfig.mdcSectionIds !=null || mdcTorqueConfig.mdcSectionIds.size() > 0 "> and mtc.equipment_id in <foreach collection="mdcTorqueConfig.mdcSectionIds" item="id" index="index" open="(" close=")" separator=","> <foreach collection="mdcTorqueConfig.mdcSectionIds" item="id" index="index" open="(" close=")" separator=","> #{id} </foreach> </if> lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcTorqueConfigService.java
