Merge remote-tracking branch 'origin/master'

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java

@@ -169,7 +169,7 @@ public class DefectCheckServiceImpl extends BaseServiceImpl<OperPhenomenonMapper
         // 现象发起来源
         String sourceName = DictCache.getValue(TreatMethodConstant.SOURCE_CODE_PREFIX, entity.getSourceCode());
         // 流程名称
-        String processName = "[" + userName + "] 发起 " + "【" + sourceName + "】缺陷处理流程" + "——>" + entity.getDefectCode();
+        String processName = "[" + userName + "] 发起 " + "【" + sourceName + "】缺陷处理流程" + "——>" + entity.getFaultName();
         // 开启新的缺陷流程
         String businessKey = FlowUtil.getBusinessKey("hzims_oper_phenomenon", "" + entity.getId());
         Map<String, Object> variable = JSONObject.parseObject(JSONObject.toJSONStringWithDateFormat(entity,DateUtil.PATTERN_DATETIME), Map.class);
@@ -297,7 +297,7 @@ public class DefectCheckServiceImpl extends BaseServiceImpl<OperPhenomenonMapper
             }
             defectService.save(operDefectEntity);
             log.info("缺陷ID：" + operPhenomenonEntity.getDefectCode() + "入库成功");
-            operPhenomenonEntity.setCurrentOperator("定论");
+            operPhenomenonEntity.setCurrentOperator("流程结束");
             operPhenomenonEntity.setCurrentLinkHandler(null);
         }
         //更新数据库

hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/TimeUtils.java

@@ -14,7 +14,7 @@ public class TimeUtils {
 	 * @param nowDate
 	 * @return
 	 */
-	public static Long getDifferTime(Date endDate, Date nowDate) {
+	public static Long getDifferTime(Date nowDate,Date endDate ) {
 //		long nd = 1000 * 24 * 60 * 60L;
 		// 获得两个时间的毫秒时间差异
 //		long nh = 1000 * 60 * 60L;