Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/entity/MouldFile.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
 
 /**
@@ -16,7 +14,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-08-13
+ * @since 2019-08-21
  */
 @TableName("tb_mould_file")
 public class MouldFile extends Model<MouldFile> {
@@ -45,7 +43,6 @@ public class MouldFile extends Model<MouldFile> {
      * 上传时间
      */
     @TableField("indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**
@@ -144,6 +141,12 @@ public class MouldFile extends Model<MouldFile> {
     @TableField("part_id")
     private Integer partId;
 
+    /**
+     * 是否已经上传，0-否 1-是
+     */
+    @TableField("is_update")
+    private Integer isUpdate;
+
 
     public Integer getId() {
         return id;
@@ -305,6 +308,14 @@ public class MouldFile extends Model<MouldFile> {
         this.partId = partId;
     }
 
+    public Integer getIsUpdate() {
+        return isUpdate;
+    }
+
+    public void setIsUpdate(Integer isUpdate) {
+        this.isUpdate = isUpdate;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -333,6 +344,7 @@ public class MouldFile extends Model<MouldFile> {
         ", fileSize2=" + fileSize2 +
         ", dwgType=" + dwgType +
         ", partId=" + partId +
+        ", isUpdate=" + isUpdate +
         "}";
     }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/entity/MouldOperationDynamics.java

@@ -93,11 +93,6 @@ public class MouldOperationDynamics extends Model<MouldOperationDynamics> {
     @TableField("applicant_name")
     private String applicantName;
 
-    /**
-     * 是否已经更新过模具0-否 ，1-是(只对更新模具有效)
-     */
-    @TableField("is_update")
-    private Integer isUpdate;
 
 
     public Integer getId() {
@@ -196,14 +191,6 @@ public class MouldOperationDynamics extends Model<MouldOperationDynamics> {
         this.applicantName = applicantName;
     }
 
-    public Integer getIsUpdate() {
-        return isUpdate;
-    }
-
-    public void setIsUpdate(Integer isUpdate) {
-        this.isUpdate = isUpdate;
-    }
-
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -224,7 +211,6 @@ public class MouldOperationDynamics extends Model<MouldOperationDynamics> {
         ", isPass=" + isPass +
         ", applicantId=" + applicantId +
         ", applicantName=" + applicantName +
-        ", isUpdate=" + isUpdate +
         "}";
     }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/MouldMapper.java

@@ -30,4 +30,6 @@ public interface MouldMapper extends BaseMapper<Mould> {
     List<MouldVO> maintainMouldList(UserVO userVO);
 
     List<MouldVO> selectListByCompanyId(@Param("companyId")Integer companyId);
+
+    void updateModelProjectIdAndEquipmentIdToNullById(@Param("model")Mould model);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldServiceImpl.java

@@ -58,7 +58,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
     @Resource
     NewsNoticeUserMapper newsNoticeUserMapper;
     @Resource
-    MouldOperationDynamicsMapper mouldOperationDynamicsMapper;
+    MouldFileMapper mouldFileMapper;
 
     @Override
     public HttpRespMsg addAndUpdateMould(Mould mould, User user,Integer dynamicId) {
@@ -85,10 +85,10 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 Mould model = mouldMapper.selectById(mould.getPreUpdateId());
                 if(null != dynamicId){
                     //更新模具更新的动态为已更新
-                    MouldOperationDynamics mouldOperationDynamics = new MouldOperationDynamics();
-                    mouldOperationDynamics.setId(dynamicId);
-                    mouldOperationDynamics.setIsUpdate(1);
-                    mouldOperationDynamicsMapper.updateById(mouldOperationDynamics);
+                    MouldFile mf = new MouldFile();
+                    mf.setId(dynamicId);
+                    mf.setIsUpdate(1);
+                    mouldFileMapper.updateById(mf);
                 }
                 //查询当前模具编号的模具是否存在
 //                    if (mould.getProduceCompanyId() != null) {
@@ -118,11 +118,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 mouldMapper.insert(mould);
                 msg.data = mould;
                 //将之前的模具与项目和设备解绑
-                Mould m = new Mould();
-                m.setId(model.getId());
-                m.setProjectId(null);
-                m.setEquipmentId(null);
-                mouldMapper.updateById(model);
+                mouldMapper.updateModelProjectIdAndEquipmentIdToNullById(model);
             } else {
                 //普通创建模具
                 //查询当前模具编号的模具是否存在

cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_mould_operation_dynamics");
+        strategy.setInclude("tb_mould_file");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

cloud-model/src/main/resources/mapper/MouldFileMapper.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hssx.cloudmodel.mapper.MouldFileMapper">
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.MouldFile">
         <id column="id" property="id" />
@@ -24,6 +23,7 @@
         <result column="file_size_2" property="fileSize2" />
         <result column="dwg_type" property="dwgType" />
         <result column="part_id" property="partId" />
+        <result column="is_update" property="isUpdate" />
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -227,4 +227,5 @@
         and
             state = 3
     </select>
+
 </mapper>

cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -205,4 +205,11 @@ select
         where
           tbm.company_id = #{companyId}
     </select>
+    
+    <update id="updateModelProjectIdAndEquipmentIdToNullById">
+        update
+          tb_mould
+          SET project_id = NULL , equipment_id = NULL
+          where id = #{model.id}
+    </update>
 </mapper>

cloud-model/src/main/resources/mapper/MouldOperationDynamicsMapper.xml

@@ -16,12 +16,11 @@
         <result column="is_pass" property="isPass" />
         <result column="applicant_id" property="applicantId" />
         <result column="applicant_name" property="applicantName" />
-        <result column="is_update" property="isUpdate" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, file_id, operator_id, operator_name, indate, file_name, belong_type, content, mould_id, is_pass, applicant_id, applicant_name, is_update
+        id, file_id, operator_id, operator_name, indate, file_name, belong_type, content, mould_id, is_pass, applicant_id, applicant_name
     </sql>
     <select id="selectOperationDynamicsList" resultMap="BaseResultMap">
         select