inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -22,12 +22,29 @@ private InsOrderService insOrderService; //获取检验下单数据 @ApiOperation(value = "查询检验下单") @ApiOperation(value = "查询检验下单数据") @PostMapping("/selectInsOrderParameter") public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception { System.out.println(1); Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); InsOrder itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrder.class); return Result.success(insOrderService.selectInsOrderParameter(page, itemParameter)); } @ApiOperation(value = "添加检验下单数据") @PostMapping("/addInsOrderParameter") public Result addInsOrderParameter(@RequestBody InsOrder itemParameter) { return Result.success(insOrderService.addInsOrderParameter(itemParameter)); } @ApiOperation(value = "删除检验下单数据") @PostMapping("/delInsOrderParameter") public Result<?> delInsOrderParameter(Integer id) { return Result.success(insOrderService.delInsOrderParameter(id)); } @ApiOperation(value = "修改检验下单数据") @PostMapping("/upInsOrderParameter") public Result<?> upInsOrderParameter(@RequestBody InsOrder itemParameter) { return Result.success(insOrderService.upInsOrderParameter(itemParameter)); } } inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
@@ -20,6 +20,15 @@ //获取检验下单数据 IPage<InsOrder> selectInsOrderParameter(IPage<InsOrder> page, QueryWrapper<InsOrder> ew); //添加检验下单数据 int addInsOrderParameter(InsOrder itemParameter); //删除检验下单数据 int delInsOrderParameter(Integer id); //修改检验下单数据 int upInsOrderParameter(InsOrder itemParameter); }
@@ -45,63 +45,25 @@ @ApiModelProperty(value = "样品类型") private String smapleType; /** * 样品名称 */ @ValueTableShow(4) @ApiModelProperty(value = "样品名称") private String sample; /** * 委托公司 */ @ValueTableShow(5) @ApiModelProperty(value = "委托公司") private String entrustCompany; /** * 委托人 */ @ValueTableShow(6) @ApiModelProperty(value = "委托人") private String client; /** * 制单时间 */ @ValueTableShow(7) @ApiModelProperty("制单时间") @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime documentPreparation; /** * 委托时间 */ @ValueTableShow(8) @ApiModelProperty("委托时间") @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime entrustmentTime; /** * 样品数量 */ @ValueTableShow(9) @ValueTableShow(4) @ApiModelProperty(value = "样品数量") private Double sampleNum; /** * 紧急程度 */ @ValueTableShow(10) @ValueTableShow(5) @ApiModelProperty(value = "紧急程度") private Integer type; /** * 约定时间 */ @ValueTableShow(11) @ValueTableShow(6) @ApiModelProperty(value = "约定时间") @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -110,56 +72,56 @@ /** * 检测进度 */ @ValueTableShow(12) @ValueTableShow(7) @ApiModelProperty(value = "检测进度") private String insProgress; /** * 检测结果 */ @ValueTableShow(13) @ApiModelProperty(value = "检测结果") private String detectionResult; /** * 下单客户 */ @ValueTableShow(8) @ApiModelProperty(value = "下单客户") private String custom; /** * 下单单位 */ @ValueTableShow(9) @ApiModelProperty(value = "下单单位") private String company; /** * 工厂域 */ @ValueTableShow(10) @ApiModelProperty(value = "工厂域") private String code; /** * 实验室名称 */ @ValueTableShow(11) @ApiModelProperty(value = "实验室名称") private String laboratory; /** * 规格型号 */ @ValueTableShow(12) @ApiModelProperty(value = "规格型号") private String model; /** * 是否留样 */ @ValueTableShow(13) @ApiModelProperty(value = "是否留样") private Integer isLeave; /** * 留样数量 */ @ValueTableShow(14) @ApiModelProperty(value = "留样数量") private Integer leaveNum; @@ -178,7 +140,7 @@ */ private String otcCode; @ApiModelProperty("") @ApiModelProperty("创建人") @TableField(fill = FieldFill.INSERT) private Integer createUser; /** @@ -191,7 +153,7 @@ /** * */ @ApiModelProperty("") @ApiModelProperty("修改人") @TableField(fill = FieldFill.INSERT_UPDATE) private Integer updateUser; /** inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
@@ -20,4 +20,13 @@ //获取检验下单数据 Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, InsOrder itemParameter); //添加检验下单数据 int addInsOrderParameter(InsOrder itemParameter); //删除检验下单数据 int delInsOrderParameter(Integer id); //修改检验下单数据 int upInsOrderParameter(InsOrder itemParameter); } inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -45,6 +45,24 @@ map.put("body", insOrderMapper.selectPage(page, QueryWrappers.queryWrappers(itemParameter))); return map; } //添加检验下单数据 @Override public int addInsOrderParameter(InsOrder itemParameter) { return insOrderMapper.insert(itemParameter); } //删除检验下单数据 @Override public int delInsOrderParameter(Integer id) { return insOrderMapper.deleteById(id); } //修改检验下单数据 @Override public int upInsOrderParameter(InsOrder itemParameter) { return insOrderMapper.updateById(itemParameter); } }
@@ -104,12 +104,7 @@ create_user, create_time, update_user, update_time, entrust_Company, client, document_Preparation, entrustment_Time, detection_Result update_time from ins_order ) a <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> @@ -117,4 +112,35 @@ </if> </select> <update id="upInsOrderParameter" parameterType="com.yuanchu.mom.pojo.InsOrder"> UPDATE ins_order <set> <if test="entrustCode!=null and entrustCode!='' ">entrust_code=#{entrustCode},</if> <if test="sample_Code!=null ">sample_code=#{sampleCode},</if> <if test="custom!=null ">custom=#{custom},</if> <if test="company!=null ">company=#{company}</if> <if test="code!=null ">code=#{code}</if> <if test="type!=null ">type=#{type}</if> <if test="appointedTime!=null ">appointed_time=#{appointedTime}</if> <if test="laboratory!=null ">laboratory=#{laboratory}</if> <if test="smapleType!=null ">smaple_type=#{smapleType}</if> <if test="model!=null ">model=#{model}</if> <if test="sample!=null ">sample=#{sample}</if> <if test="sampleNum!=null ">sample_num=#{sampleNum}</if> <if test="isLeave!=null ">is_leave=#{isLeave}</if> <if test="leaveNum!=null ">leave_num=#{leaveNum}</if> <if test="insProgress!=null ">ins_progress=#{insProgress}</if> <if test="state!=null ">state=#{state}</if> <if test="remark!=null ">remark=#{remark}</if> <if test="otcCode!=null ">otc_code=#{otcCode}</if> <if test="createUser!=null ">create_user=#{createUser}</if> <if test="createTime!=null ">create_time=#{createTime}</if> <if test="updateUser!=null ">update_user=#{updateUser}</if> <if test="updateTime!=null ">update_time=#{updateTime}</if> </set> <where> id=#{id} </where> </update> </mapper>
