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/controller/AssetCustomCompanyController.java

@@ -6,10 +6,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
  * @author 吴涛涛
  * @since 2019-08-16
  */

cloud-model/src/main/java/com/hssx/cloudmodel/controller/ProjectController.java

@@ -39,10 +39,10 @@ public class ProjectController {
     /**
      * 添加/修改项目
      * 参数：projectName 项目名 ,customerCompanyIds 客户方公司ids "1,2,3",customerCompanyNames 客户方公司名字“1,2,3”
-     * managerId 项目经理id  manager 项目经理name
+     *
      * 修改时/添加时分配项目: id 项目id ，userIds 参与项目的用户id 如：“1,2,3”(多个或者一个)()
      * customerApproverId 生产方审批人id，ownerApproverId 资产方审批人id
-     * managerId 项目经理id 非必传，managerId 项目经理  modelIds 模具ids 如 :"1,2,3"
+     * managerId 项目经理id  ,manager 项目经理name  ,modelIds 模具ids 如 :"1,2,3"
      * flag 0-添加，1-修改
      *
      * @return

cloud-model/src/main/java/com/hssx/cloudmodel/entity/MouldOperationDynamics.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-08
+ * @since 2019-08-19
  */
 @TableName("tb_mould_operation_dynamics")
 public class MouldOperationDynamics extends Model<MouldOperationDynamics> {
@@ -36,22 +34,21 @@ public class MouldOperationDynamics extends Model<MouldOperationDynamics> {
     private Integer fileId;
 
     /**
-     * 下载者id
+     * 操作者id
      */
     @TableField("operator_id")
     private Integer operatorId;
 
     /**
-     * 下载者姓名
+     * 操作者姓名
      */
     @TableField("operator_name")
     private String operatorName;
 
     /**
-     * 下载的时间
+     * 操作的时间
      */
     @TableField("indate")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**
@@ -78,6 +75,12 @@ public class MouldOperationDynamics extends Model<MouldOperationDynamics> {
     @TableField("mould_id")
     private Integer mouldId;
 
+    /**
+     * 是否通过 0-不通过 1-通过
+     */
+    @TableField("is_pass")
+    private Integer isPass;
+
 
     public Integer getId() {
         return id;
@@ -151,6 +154,14 @@ public class MouldOperationDynamics extends Model<MouldOperationDynamics> {
         this.mouldId = mouldId;
     }
 
+    public Integer getIsPass() {
+        return isPass;
+    }
+
+    public void setIsPass(Integer isPass) {
+        this.isPass = isPass;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -168,6 +179,7 @@ public class MouldOperationDynamics extends Model<MouldOperationDynamics> {
         ", belongType=" + belongType +
         ", content=" + content +
         ", mouldId=" + mouldId +
+        ", isPass=" + isPass +
         "}";
     }
 }

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

@@ -239,12 +239,19 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         MouldFile mf = new MouldFile();
         mf.setId(mouldFileId);
         MouldFile oldData = mouldFileMapper.selectById(mouldFileId);
+        MouldOperationDynamics dynamics = new MouldOperationDynamics();
         if (user != null) {
             if (user.getSubordinateType() == 0) {
                 //资产方
                 if (isPass == 1) {
                     if (oldData.getState() == 2) {//生产方也审核通过了
                         mf.setState(3);
+                        //审批通过
+                        dynamics.setIsPass(1);
+                        //模具更新的审批
+                        if(oldData.getBlongType()==4){
+
+                        }
                         //审批的是模具报废文件
                         if(oldData.getBlongType()==5){
                             //将模具修改为已报废
@@ -255,13 +262,14 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                         }
                     } else {
                         mf.setState(1);
+                        dynamics.setIsPass(1);
                     }
                 } else {
                     mf.setState(-1);
+                    dynamics.setIsPass(0);
                 }
                 mouldFileMapper.updateById(mf);
                 //添加审批记录
-                MouldOperationDynamics dynamics = new MouldOperationDynamics();
                 dynamics.setMouldId(oldData.getId());
                 dynamics.setBelongType(oldData.getBlongType());
                 dynamics.setFileId(oldData.getId());
@@ -279,6 +287,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 if (isPass == 1) {
                     if (oldData.getState() == 1) {//资产方也审核通过了
                         mf.setState(3);
+                        dynamics.setIsPass(1);
                         //将模具修改为已报废
                         if(oldData.getBlongType()==5){
                             Mould mould = new Mould();
@@ -288,13 +297,14 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                         }
                     } else {
                         mf.setState(2);
+                        dynamics.setIsPass(1);
                     }
                 } else {
                     mf.setState(-2);
+                    dynamics.setIsPass(0);
                 }
                 mouldFileMapper.updateById(mf);
                 //添加审批记录
-                MouldOperationDynamics dynamics = new MouldOperationDynamics();
                 dynamics.setMouldId(oldData.getId());
                 dynamics.setBelongType(oldData.getBlongType());
                 dynamics.setFileId(oldData.getId());

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

@@ -85,6 +85,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 //更新模具操作
                 //取出之前模具的信息
                 Mould model = mouldMapper.selectById(mould.getPreUpdateId());
+                //将之前的模具与项目和设备解绑
                 model.setProjectId(null);
                 model.setEquipmentId(null);
                 mouldMapper.updateById(model);

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");
+        strategy.setInclude("tb_mould_operation_dynamics");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -13,11 +13,12 @@
         <result column="belong_type" property="belongType" />
         <result column="content" property="content" />
         <result column="mould_id" property="mouldId" />
+        <result column="is_pass" property="isPass" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, file_id, operator_id, operator_name, indate, file_name, belong_type, content, mould_id
+        id, file_id, operator_id, operator_name, indate, file_name, belong_type, content, mould_id, is_pass
     </sql>
 
 </mapper>