diff --git a/start/src/main/resources/templates/primeport.html b/start/src/main/resources/templates/primeport.html index a51ee21..4e282c8 100644 --- a/start/src/main/resources/templates/primeport.html +++ b/start/src/main/resources/templates/primeport.html @@ -1,4 +1,4 @@ ---
\ No newline at end of file + })();
\ No newline at end of file diff --git a/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java index d24f752..50c8bde 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.exception.BizException; import com.jjb.saas.framework.auth.utils.AuthContext; +import com.zcloud.gbscommon.utils.DateUtil; import com.zcloud.primeport.domain.gateway.PersonApplyGateway; import com.zcloud.primeport.domain.gateway.XgfApplyPersonGateway; import com.zcloud.primeport.domain.model.PersonApplyE; @@ -20,7 +21,9 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; +import java.time.ZoneOffset; import java.util.ArrayList; +import java.util.Date; import java.util.List; @@ -105,6 +108,7 @@ public class PersonApplyAddExe { public XgfPersonApplyCO xgfPersonApplyInfoById(Long id) { XgfPersonApplyCO xgfPersonApplyCO = new XgfPersonApplyCO(); XgfApplyPersonE xgfApplyPersonE = xgfApplyPersonGateway.getInfoById(id); + xgfApplyPersonE.setApplyTime(DateUtil.date2Str(Date.from(xgfApplyPersonE.getCreateTime().toInstant(ZoneOffset.ofHours(8))))); BeanUtils.copyProperties(xgfApplyPersonE, xgfPersonApplyCO); List userApplyList = personApplyGateway.personListByxgfApplyPersonId(id); ArrayList personApplyAddCmdExts = new ArrayList<>(); diff --git a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java index a5f4173..00f227d 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java @@ -75,6 +75,7 @@ public class VehicleApplyUpdateExe { vehicleApplyE.setLicenceNo(cmd.getLicenceNo()); vehicleApplyE.setLicenceTypeName(cmd.getLicenceTypeName()); vehicleApplyE.setLicenceType(cmd.getLicenceType()); + vehicleApplyE.setRemarks(cmd.getRemarks()); vehicleApplyGateway.update(vehicleApplyE); } } diff --git a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java index e4dbe5d..2f10864 100644 --- a/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java +++ b/web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java @@ -150,7 +150,8 @@ public class VehicleApplyCO extends ClientObject { private Long auditUserId; @ApiModelProperty(value = "currentUserId", name = "当前用户") private Long currentUserId; - + @ApiModelProperty(value = "检查部门名称", name = "checkDepartmentName") + private String checkDepartmentName; @ApiModelProperty(value = "车辆申请的审批记录", name = "VehicleAuditLogList") private List vehicleAuditLogList; diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java b/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java index 92b2f48..75abf21 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java @@ -47,5 +47,6 @@ public class XgfApplyPersonE extends BaseE { private String auditUserName; private String reasonsRefusal; private String reasonVisit; + private String applyTime; } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java index 63e6367..087877f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java @@ -133,6 +133,8 @@ public class VehicleApplyDO extends BaseDO { @ApiModelProperty(value = "审核用户名称") @TableField(exist = false) private String auditUserName; - + @ApiModelProperty(value = "检查部门名称", name = "checkDepartmentName") + @TableField(exist = false) + private String checkDepartmentName; } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java index 8e6bdf9..228fa88 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java @@ -8,6 +8,7 @@ import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Query; +import com.zcloud.gbscommon.utils.Tools; import com.zcloud.primeport.domain.enums.MenuEnum; import com.zcloud.primeport.persistence.dataobject.MkmjDO; import com.zcloud.primeport.persistence.dataobject.VehicleViolationsDO; @@ -36,6 +37,8 @@ public class VehicleViolationsRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); + queryWrapper.eq(Tools.isEmpty(params.get("violationType")),"violation_type",params.get("violationType")); + queryWrapper.eq("licence_no",params.get("licenceNo")); queryWrapper.orderByDesc("create_time"); IPage result = vehicleViolationsMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); diff --git a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml index 1add0bd..621cc82 100644 --- a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml @@ -83,6 +83,7 @@ va.vehicle_corp_id ) tmp LEFT JOIN corp_info c on tmp.apply_corp_id = c.id + where 1 = 1 GROUP BY tmp.apply_corp_id; diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index 2b4071f..c28b8a5 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -40,7 +40,8 @@ a.audit_dept_id, a.audit_dept_name, a.audit_corp_name, - a.audit_corp_id + a.audit_corp_id, + f.remarks check_department_name, FROM vehicle_apply AS f LEFT JOIN vehicle_audit AS a ON f.id = a.vehicle_apply_id diff --git a/web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml index 02c1ff3..2fd65ca 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml @@ -43,42 +43,14 @@ b.licence_type_name, b.licence_no, b.vehicle_type, - b.vehicle_type_name, - a.vehicle_belong_type, - a.gate_level_auth_area, - a.vehicle_corp_id, - a.vehicle_corp_name, - a.vehicle_department_id, - a.vehicle_department_name, - a.employee_vehicle_user_id, - a.employee_vehicle_user_name, - a.emission_standards, - a.emission_standards_name, - a.driving_license_id, - a.attachment_id, - a.inform_sign_id, - a.project_id, - a.project_name, - a.ls_user_idcard, - a.ls_user_phone, - a.mkmj_id + b.vehicle_type_name FROM vehicle_black AS b - LEFT JOIN vehicle_apply AS a ON b.licence_no = a.licence_no WHERE b.delete_enum = 'FALSE' AND b.licence_no LIKE CONCAT('%', #{params.licenceNo}, '%') - - AND a.employee_vehicle_user_name LIKE CONCAT('%', #{params.employeeVehicleUserName}, '%') - - - AND a.vehicle_department_id = #{params.vehicleDepartmentId} - - - AND a.vehicleType LIKE CONCAT('%', #{params.vehicleType}, '%') - diff --git a/web-infrastructure/src/main/resources/mapper/VehicleViolationsDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleViolationsDO.xml index f43be37..8df8821 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleViolationsDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleViolationsDO.xml @@ -8,27 +8,11 @@ resultType="com.zcloud.primeport.persistence.dataobject.VehicleViolationsDO"> SELECT f.licence_no, - a.id vehicle_id, - a.vehicle_belong_type, - a.employee_vehicle_user_name, - a.employee_vehicle_user_id, - a.vehicle_department_name, - a.vehicle_department_id, - a.vehicle_corp_name, - a.vehicle_corp_id, - a.vehicle_type, - a.vehicle_type_name, - a.licence_type_name, - a.licence_type, - COUNT(f.licence_no) violation_count + COUNT( f.id ) violation_count FROM vehicle_violations AS f - LEFT JOIN - vehicle_apply AS a - ON - f.licence_no = a.licence_no AND - a.delete_enum = 'FALSE' - where f.delete_enum = 'FALSE' + WHERE + f.delete_enum = 'FALSE' GROUP BY f.licence_no diff --git a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml index ab51414..d9d15b1 100644 --- a/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml +++ b/web-infrastructure/src/main/resources/mapper/XgfApplyPersonDO.xml @@ -47,10 +47,10 @@ - AND xap.audit_status = 1 + AND xap.audit_flag = 1 - AND xap.audit_status != 1 + AND xap.audit_flag != 1 @@ -120,7 +120,7 @@ pa.id apply_person_id, pa.xgf_apply_person_id, IFNULL( tmp.vehicle_count, 0 ) vehicle_count, - IFNULL( xap.mkmj_permission, 2 ) mkmj_permission, + IFNULL( pa.mkmj_permission, 2 ) mkmj_permission, u.user_avatar_url user_face_url FROM USER u