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/service/impl/MouldFileServiceImpl.java

@@ -249,7 +249,6 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                         //审批通过
                         dynamics.setIsPass(1);
                         //模具更新的审批
-                        //审批的是模具报废文件
                         if(oldData.getBlongType()==5){
                             //将模具修改为已报废
                             Mould mould = new Mould();
@@ -267,6 +266,16 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 }
                 mouldFileMapper.updateById(mf);
                 if(oldData.getBlongType()==4){
+                    //审批的是模具报废文件
+//                    if(mouldOperationDynamicsMapper.selectCount(new MouldOperationDynamics())){
+//
+//                    }
+                        dynamics.setMouldId(oldData.getId());
+                        dynamics.setBelongType(oldData.getBlongType());
+                        dynamics.setContent(Constant.APPROVAL);
+                        dynamics.setOperatorId(user.getId());
+                        dynamics.setOperatorName(user.getUsername());
+                        mouldOperationDynamicsMapper.insert(dynamics);
 
                 }else{
                         //添加审批记录

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

@@ -99,7 +99,7 @@
             <result column="model_no" property="modelNo" />
             <result column="model_name" property="modelName" />
             <result column="produce_company_id" property="produceCompanyId" />
-            <result column="produce_company_name" property="factoryName" />
+            <result column="produce_company_name" property="produceCompanyName" />
         </collection>
         <collection property="approves" ofType="com.hssx.cloudmodel.entity.ProjectApprove">
             <result column="approver_id" property="approverId" />