Merge remote-tracking branch 'origin/master'

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/UsegasApply.java

@@ -46,11 +46,11 @@ public class UsegasApply extends BaseBean {
     @NotNull(message = "联系方式不能为空！")
     private String phone;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
     @ApiModelProperty("期限开始")
     private Date startTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
     @ApiModelProperty("期限结束")
     @NotNull(message = "使用期限不能为空！")
     private Date endTime;

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/BottleStorageErrorServiceImpl.java

@@ -43,11 +43,11 @@ public class BottleStorageErrorServiceImpl extends ServiceImpl<BottleStorageErro
         LambdaQueryWrapper<BottleStorageError> queryWrapper = Wrappers.lambdaQuery(BottleStorageError.class);
         String startTime = bottleStorageError.getStartTime();
         if (StringUtils.hasLength(startTime)) {
-            queryWrapper.apply("DATE_FORMAT(op_time,'%Y-%m-%d') >=" + startTime);
+            queryWrapper.apply(StringUtils.hasLength(startTime), "DATE_FORMAT(create_time,'%Y-%m-%d') >=date_format('" + startTime + "','%Y-%m-%d')");
         }
         String endTime = bottleStorageError.getEndTime();
         if (StringUtils.hasLength(endTime)) {
-            queryWrapper.apply("DATE_FORMAT(op_time,'%Y-%m-%d') <=" + endTime);
+            queryWrapper.apply(StringUtils.hasLength(endTime), "DATE_FORMAT(create_time,'%Y-%m-%d') <=date_format('" + endTime + "','%Y-%m-%d')");
         }
         String searchValue = bottleStorageError.getSearchValue();
         if (StringUtils.hasLength(searchValue)) {
@@ -60,6 +60,7 @@ public class BottleStorageErrorServiceImpl extends ServiceImpl<BottleStorageErro
         if (ids!=null && !ids.isEmpty()){
             queryWrapper.in(BottleStorageError::getId,ids);
         }
+        queryWrapper.orderByDesc(true,BottleStorageError::getCreateTime);
         return list(queryWrapper);
     }
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UseRecordServiceImpl.java

@@ -97,6 +97,7 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
         if (ids != null && !ids.isEmpty()) {
             queryWrapper.in(UseRecord::getId, ids);
         }
+        queryWrapper.orderByDesc(true,UseRecord::getUseTime);
         queryWrapper.setEntity(useRecord);
         return list(queryWrapper);
     }

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/UsegasApplyMapper.xml

@@ -29,7 +29,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,
+        id
+        ,
         create_time,
         location, subject_id, apply_user, user_id, dept_id, dept_name, phone, start_time, end_time, gas_use, apply_certificate, safety_precautions, use_gas_id, use_gas_name, lead_audit_staus, lead_audit_userid, lead_audit_username, lead_audit_time, lead_audit_cause
     </sql>
@@ -39,7 +40,8 @@
             resultType="com.zd.bottle.vo.UsegasApplyVo">
         select ua.id,ua.apply_user applyUserName,ua.phone applyUserPhone,ua.use_gas_name useGasName,ua.create_time
         applyTime,
-        ua.start_time startTime,ua.end_time endTime,ua.gas_use gasUse,ua.safety_precautions safetyPrecautions,
+        ua.start_time startTime,ua.end_time endTime,ua.gas_use gasUse,ua.apply_certificate applyCertificate,
+        ua.safety_precautions safetyPrecautions,
         ua.use_gas_file useGasFile
         from ab_usegas_apply ua
         <where>

zd-modules/zd-chemical/src/main/java/com/zd/chemical/mapper/ActHxpapplyDetailMapper.java

@@ -62,6 +62,14 @@ public interface ActHxpapplyDetailMapper
     int updateActHxpapplyDetail(ActHxpapplyDetail actHxpapplyDetail);
 
     /**
+     * 修改申购的化学品通过
+     *
+     * @param actHxpapplyDetail 修改申购的化学品通过
+     * @return 结果
+     */
+    int updateActHxpapplyDetailByPass(ActHxpapplyDetail actHxpapplyDetail);
+
+    /**
      * 删除化学品申购详情
      *
      * @param id 化学品申购详情主键

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/ActHxpapplyServiceImpl.java

@@ -367,7 +367,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
                         ActApplytaskNode actApplytaskNode = new ActApplytaskNode();
                         StringBuffer stringBuffer = new StringBuffer();
                         //这里生成或签的规则。
-                        jumpApplyFun(pre,collect,jumpApply,actApplytaskNode);
+                        jumpApplyFun(pre,collect,jumpApply,actApplytaskNode,actApplytask);
                         Optional.ofNullable(collect).orElseGet(Collections::emptyList)
                                 .stream()
                                 .forEach(c1->{
@@ -402,7 +402,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
                                     actApplytaskNode.setApplytaskId(actApplytask.getId());
                                     actApplytaskNode.setApplyUserIds(f.getAuditUserId()+"");
                                     actApplytaskNode.setNodeOrder(Integer.parseInt(countAdder.sum()+""));
-                                    jumpApplyFun(createUserId,f.getAuditUserId(),jumpApply,actApplytaskNode);
+                                    jumpApplyFun(createUserId,f.getAuditUserId(),jumpApply,actApplytaskNode,actApplytask);
                                     actApplytaskNode.setAuditconfigId(a.getId());
                                     insertNodeSave(actApplytaskNode);
                                 });
@@ -446,11 +446,15 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
     }
 
     // 这里处理一下跳过审核，只有当前审批人是申请人的时候，才做审批通过（或审）
-    private void jumpApplyFun(Predicate<List <ActAudituser>> pre,List <ActAudituser> actAuditusers,Map<String,Long> jumpApply,ActApplytaskNode actApplytaskNode){
+    private void jumpApplyFun(Predicate<List <ActAudituser>> pre,List <ActAudituser> actAuditusers,Map<String,Long> jumpApply,ActApplytaskNode actApplytaskNode,ActApplytask actApplytask){
         if(pre.test(actAuditusers) && jumpApply.get("jumpApply")==1){
             actApplytaskNode.setNodeStatus(1);
             actApplytaskNode.setApplyUserid(SecurityUtils.getUserId());
             actApplytaskNode.setUpdateTime(new Date());
+            //todo 这里如果是当前用户跳过的，需要把事情的化学品全部修改为勾选
+            ActHxpapplyDetail actHxpapplyDetail = new ActHxpapplyDetail();
+            actHxpapplyDetail.setHxpapplyId(actApplytask.getTaskId());
+            actHxpapplyDetailMapper.updateActHxpapplyDetailByPass(actHxpapplyDetail);
             jumpApply.put("jumpApply",1L);
         }else{
             jumpApply.put("jumpApply",2L);
@@ -458,11 +462,15 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
     }
 
     // 这里处理一下跳过审核，只有当前审批人是申请人的时候，才做审批通过(依次审批)
-    private void jumpApplyFun(Long createUserId,Long auditUserId,Map<String,Long> jumpApply,ActApplytaskNode actApplytaskNode){
+    private void jumpApplyFun(Long createUserId,Long auditUserId,Map<String,Long> jumpApply,ActApplytaskNode actApplytaskNode,ActApplytask actApplytask){
         if(createUserId.longValue() == auditUserId.longValue() && jumpApply.get("jumpApply")==1){
             actApplytaskNode.setNodeStatus(1);
             actApplytaskNode.setApplyUserid(SecurityUtils.getUserId());
             actApplytaskNode.setUpdateTime(new Date());
+            //todo 这里如果是当前用户跳过的，需要把事情的化学品全部修改为勾选
+            ActHxpapplyDetail actHxpapplyDetail = new ActHxpapplyDetail();
+            actHxpapplyDetail.setHxpapplyId(actApplytask.getTaskId());
+            actHxpapplyDetailMapper.updateActHxpapplyDetailByPass(actHxpapplyDetail);
             jumpApply.put("jumpApply",1L);
         }else{
             jumpApply.put("jumpApply",2L);

zd-modules/zd-chemical/src/main/resources/mapper/chemical/ActHxpapplyDetailMapper.xml

@@ -118,6 +118,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+
+    <update id="updateActHxpapplyDetailByPass" parameterType="com.zd.chemical.domain.ActHxpapplyDetail">
+        update act_hxpapply_detail
+        set tick_status=1
+        where hxpapply_id = #{hxpapplyId}
+    </update>
+
     <delete id="deleteActHxpapplyDetailById">
         delete from act_hxpapply_detail where id = #{id}
     </delete>