fix:[麻精药表单]bug

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java

@@ -39,6 +39,18 @@ public class StudyFormApply extends MpBaseEntity
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long sdId;
 
+    /** 试验物资名称 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String sywzmc;
+
+    /** 需要浓度 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String xynd;
+
+    /** 需要时间 */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String xysj;
+
     /** 表单编号 */
     private String bdbh;
 
@@ -130,6 +142,30 @@ public class StudyFormApply extends MpBaseEntity
     @TableField(exist = false)
     private String studyMc;
 
+    public String getSywzmc() {
+        return sywzmc;
+    }
+
+    public void setSywzmc(String sywzmc) {
+        this.sywzmc = sywzmc;
+    }
+
+    public String getXynd() {
+        return xynd;
+    }
+
+    public void setXynd(String xynd) {
+        this.xynd = xynd;
+    }
+
+    public String getXysj() {
+        return xysj;
+    }
+
+    public void setXysj(String xysj) {
+        this.xysj = xysj;
+    }
+
     public Long getSyId() {
         return syId;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormApplyListDto.java

@@ -1,11 +1,33 @@
 package com.hxhq.business.dto.study;
 
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.hxhq.business.domain.StudyFormApply;
 
 /**
  * @author tanfei
  */
 public class StudyFormApplyListDto extends StudyFormApply {
+    /** 试验编号 */
+    private String sySn;
 
+    /** 部门名称 */
+    private String bmName;
+
+    public String getSySn() {
+        return sySn;
+    }
+
+    public void setSySn(String sySn) {
+        this.sySn = sySn;
+    }
+
+    public String getBmName() {
+        return bmName;
+    }
+
+    public void setBmName(String bmName) {
+        this.bmName = bmName;
+    }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormApplySearchForm.java

@@ -10,12 +10,39 @@ public class StudyFormApplySearchForm {
     /** 所属试验学科id */
     private Long studySubjectId;
 
+    /** 归属人 */
+    private String userMc;
+
     /** 表单编号 */
     private String bdbh;
 
     /** 表单名称 */
     private String bdmc;
 
+    /** 试验编号/部门 */
+    private String sybhbm;
+
+    /** 试验物质名称 */
+    private String sywzmc;
+
+    /** 需要浓度 */
+    private String xynd;
+
+    /** 需要时间开始 */
+    private String xysjks;
+
+    /** 需要时间结束 */
+    private String xysjjs;
+
+    /** 需要时间排序 */
+    private Integer xyssort;
+
+    /** 提交时间排序 */
+    private Integer tjsjsort;
+
+    /** 表单状态 */
+    private Integer bdzt;
+
     /** 表单归属人id */
     private Long userId;
 
@@ -37,6 +64,78 @@ public class StudyFormApplySearchForm {
     /** 创建时间开始 */
     private String cjsjjs;
 
+    public String getUserMc() {
+        return userMc;
+    }
+
+    public void setUserMc(String userMc) {
+        this.userMc = userMc;
+    }
+
+    public Integer getBdzt() {
+        return bdzt;
+    }
+
+    public void setBdzt(Integer bdzt) {
+        this.bdzt = bdzt;
+    }
+
+    public String getSybhbm() {
+        return sybhbm;
+    }
+
+    public void setSybhbm(String sybhbm) {
+        this.sybhbm = sybhbm;
+    }
+
+    public String getSywzmc() {
+        return sywzmc;
+    }
+
+    public void setSywzmc(String sywzmc) {
+        this.sywzmc = sywzmc;
+    }
+
+    public String getXynd() {
+        return xynd;
+    }
+
+    public void setXynd(String xynd) {
+        this.xynd = xynd;
+    }
+
+    public String getXysjks() {
+        return xysjks;
+    }
+
+    public void setXysjks(String xysjks) {
+        this.xysjks = xysjks;
+    }
+
+    public String getXysjjs() {
+        return xysjjs;
+    }
+
+    public void setXysjjs(String xysjjs) {
+        this.xysjjs = xysjjs;
+    }
+
+    public Integer getXyssort() {
+        return xyssort;
+    }
+
+    public void setXyssort(Integer xyssort) {
+        this.xyssort = xyssort;
+    }
+
+    public Integer getTjsjsort() {
+        return tjsjsort;
+    }
+
+    public void setTjsjsort(Integer tjsjsort) {
+        this.tjsjsort = tjsjsort;
+    }
+
     public Long getStudySubjectId() {
         return studySubjectId;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java

@@ -42,7 +42,7 @@ public interface StudyFormApplyMapper extends BaseMapper
      * @param bmId
      * @param sdId
      */
-    void updateBdnrZdxgjl(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl,@Param("syId") Long syId,@Param("bmId") Long bmId,@Param("sdId") Long sdId);
+    void updateBdnrZdxgjl(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl,@Param("syId") Long syId,@Param("bmId") Long bmId,@Param("sdId") Long sdId,@Param("sywzmc") String sywzmc,@Param("xynd") String xynd,@Param("xysj") String xysj);
 
     /**
      * 更新表单内容

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java

@@ -83,6 +83,24 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
         if (StringUtils.isNoneBlank(form.getBdbh())) {
             queryWrapper.and(p -> p.like("t.`bdbh`", form.getBdbh()));
         }
+        if (StringUtils.isNoneBlank(form.getSywzmc())) {
+            queryWrapper.and(p -> p.like("t.`sywzmc`", form.getSywzmc()));
+        }
+        if (StringUtils.isNoneBlank(form.getXynd())) {
+            queryWrapper.and(p -> p.like("t.`xynd`", form.getXynd()));
+        }
+        if (StringUtils.isNoneBlank(form.getSybhbm())) {
+            queryWrapper.and(p -> p.like("ts.sn", form.getSybhbm()).or().like("sd.dept_name", form.getSybhbm()));
+        }
+        if (StringUtils.isNoneBlank(form.getXysjks())) {
+            queryWrapper.apply("t.xysj>={0}", form.getXysjks());
+        }
+        if (StringUtils.isNoneBlank(form.getXysjjs())) {
+            queryWrapper.apply("t.xysj<{0}", form.getXysjjs());
+        }
+        if (form.getBdzt() != null && form.getBdzt().intValue() > 0) {
+            queryWrapper.eq("t.bdzt", form.getBdzt());
+        }
         if (StringUtils.isNoneBlank(form.getBdmc())) {
             queryWrapper.and(p -> p.like("t.`bdmc`", form.getBdmc()));
         }
@@ -289,6 +307,16 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
                 throw new ServiceException("只能操作自己的表单");
             }
             studyFormApplyOld.setBdmc(studyFormApply.getBdmc());
+            //更新特殊字段
+            if(StringUtils.isNoneBlank(studyFormApply.getBdnr())){
+                JSONObject jsonObject=JSONObject.parseObject(studyFormApply.getBdnr());
+                studyFormApplyOld.setSdId(jsonObject.getLong("sdId"));
+                studyFormApplyOld.setSyId(jsonObject.getLong("syId"));
+                studyFormApplyOld.setBmId(jsonObject.getLong("bmId"));
+                studyFormApplyOld.setSywzmc(jsonObject.getString("sywzmc"));
+                studyFormApplyOld.setXynd(jsonObject.getString("xynd"));
+                studyFormApplyOld.setXysj(jsonObject.getString("xysj"));
+            }
             studyFormApplyOld.setTemplateId(studyFormApply.getTemplateId());
             studyFormApplyOld.setBdnr(studyFormApply.getBdnr());
             studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.tbz.getValue());
@@ -304,7 +332,16 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
             }
             result = studyFormApplyOld;
         } else {
-
+            //更新特殊字段
+            if(StringUtils.isNoneBlank(studyFormApply.getBdnr())){
+                JSONObject jsonObject=JSONObject.parseObject(studyFormApply.getBdnr());
+                studyFormApply.setSdId(jsonObject.getLong("sdId"));
+                studyFormApply.setSyId(jsonObject.getLong("syId"));
+                studyFormApply.setBmId(jsonObject.getLong("bmId"));
+                studyFormApply.setSywzmc(jsonObject.getString("sywzmc"));
+                studyFormApply.setXynd(jsonObject.getString("xynd"));
+                studyFormApply.setXysj(jsonObject.getString("xysj"));
+            }
             studyFormApply.setBdzt(StudyFormApplyBdztEnum.tbz.getValue());
             studyFormApply.setUserId(qmr.getUserId());
             studyFormApply.setBdbh(getSn(studyFormApply));
@@ -342,11 +379,30 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
             studyFormApplyOld.setBdmc(studyFormApply.getBdmc());
             studyFormApplyOld.setTemplateId(studyFormApply.getTemplateId());
             studyFormApplyOld.setBdnr(studyFormApply.getBdnr());
+            //更新特殊字段
+            if(StringUtils.isNoneBlank(studyFormApply.getBdnr())){
+                JSONObject jsonObject=JSONObject.parseObject(studyFormApply.getBdnr());
+                studyFormApplyOld.setSdId(jsonObject.getLong("sdId"));
+                studyFormApplyOld.setSyId(jsonObject.getLong("syId"));
+                studyFormApplyOld.setBmId(jsonObject.getLong("bmId"));
+                studyFormApplyOld.setSywzmc(jsonObject.getString("sywzmc"));
+                studyFormApplyOld.setXynd(jsonObject.getString("xynd"));
+                studyFormApplyOld.setXysj(jsonObject.getString("xysj"));
+            }
             studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.tbz.getValue());
             this.updateById(studyFormApplyOld);
             result = studyFormApplyOld;
         } else {
-
+            //更新特殊字段
+            if(StringUtils.isNoneBlank(studyFormApply.getBdnr())){
+                JSONObject jsonObject=JSONObject.parseObject(studyFormApply.getBdnr());
+                studyFormApply.setSdId(jsonObject.getLong("sdId"));
+                studyFormApply.setSyId(jsonObject.getLong("syId"));
+                studyFormApply.setBmId(jsonObject.getLong("bmId"));
+                studyFormApply.setSywzmc(jsonObject.getString("sywzmc"));
+                studyFormApply.setXynd(jsonObject.getString("xynd"));
+                studyFormApply.setXysj(jsonObject.getString("xysj"));
+            }
             studyFormApply.setBdzt(StudyFormApplyBdztEnum.tbz.getValue());
             studyFormApply.setUserId(qmr.getUserId());
             studyFormApply.setBdbh(getSn(studyFormApply));
@@ -375,6 +431,16 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
             studyFormApply.setUserMc(SecurityUtils.getNickName());
             studyFormApply.setBdbh(getSn(studyFormApply));
         }
+        //更新特殊字段
+        if(StringUtils.isNoneBlank(studyFormApply.getBdnr())){
+            JSONObject jsonObject=JSONObject.parseObject(studyFormApply.getBdnr());
+            studyFormApply.setSdId(jsonObject.getLong("sdId"));
+            studyFormApply.setSyId(jsonObject.getLong("syId"));
+            studyFormApply.setBmId(jsonObject.getLong("bmId"));
+            studyFormApply.setSywzmc(jsonObject.getString("sywzmc"));
+            studyFormApply.setXynd(jsonObject.getString("xynd"));
+            studyFormApply.setXysj(jsonObject.getString("xysj"));
+        }
         studyFormApply.setBdzt(StudyFormApplyBdztEnum.ytj.getValue());
         studyFormApply.setTjsj(new Date());
         this.saveOrUpdate(studyFormApply);
@@ -590,7 +656,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         JSONObject bdnr = JSONObject.parseObject(form.getBdnr());
         if(StringUtils.isNoneBlank(form.getZdxgjl())) {
-            baseMapper.updateBdnrZdxgjl(form.getId(), form.getBdnr(), form.getZdxgjl(), bdnr.getLong("syId"), bdnr.getLong("bmId"), bdnr.getLong("sdId"));
+            baseMapper.updateBdnrZdxgjl(form.getId(), form.getBdnr(), form.getZdxgjl(), bdnr.getLong("syId"), bdnr.getLong("bmId"), bdnr.getLong("sdId"),bdnr.getString("sywzmc"),bdnr.getString("xynd"),bdnr.getString("xysj"));
         }else{
             baseMapper.updateBdnr(form.getId(), form.getBdnr(),  bdnr.getLong("syId"), bdnr.getLong("bmId"), bdnr.getLong("sdId"));
         }

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormApplyMapper.xml

@@ -4,10 +4,12 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.StudyFormApplyMapper">
     <select id="queryList" resultType="com.hxhq.business.dto.study.StudyFormApplyListDto">
-        select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.user_id,t.bdzt,t.bdzt,t.tjsj,t.sfbl,
-               tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId
+        select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.user_id,t.bdzt,t.bdzt,t.tjsj,t.sfbl,t.sywzmc,t.xynd,t.xysj,
+               tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId,ts.sn as sySn,sd.dept_name as bmName
         FROM `t_study_form_apply` t
         join t_template tm on tm.id=t.template_id
+        left join t_study ts on ts.id=t.sy_id
+        left join sys_dept sd on sd.dept_id=t.bm_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}
@@ -25,7 +27,7 @@
     </select>
 
     <update id="updateBdnr" >
-        update  t_study_form_apply set bdnr=#{bdnr},sy_id=#{syId},bm_id=#{bmId},sd_id=#{sdId}  where id=#{id};
+        update  t_study_form_apply set bdnr=#{bdnr},sy_id=#{syId},bm_id=#{bmId},sd_id=#{sdId},sywzmc=#{sywzmc},xynd=#{xynd},xysj=#{xysj}  where id=#{id};
     </update>
 
     <update id="updateBdnrZdxgjl" >