DBNT
/
FAICS
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.0.157:3000/DBNT/FAICS

master
Hyung Geun 2022-04-20 11:23:26 +09:00
parent cc4f8ddf6d f6f94152cc
commit 3010732fb5
4 changed files with 90 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/kcg/faics/equip/service/impl/EquipmentServiceImpl.java
View File

@ -170,7 +170,7 @@ public class EquipmentServiceImpl implements EquipmentService {
while (it.hasNext()) {
HashMap<String, Object> value = paramMap.get(it.next());
HashMap<String, Object> record = equipmentMapper.getEquipUseStateInfoByCode(value);
boolean isInsert = (record == null) ? true : false;
boolean isInsert = record == null;
if (isInsert) {
success = equipmentMapper.insertEquipUseState(value);

6
src/main/java/kcg/faics/equip/vo/EquipVO.java
View File

@ -10,7 +10,7 @@ package kcg.faics.equip.vo;
*
*/
public class EquipVO {
private String serNo;
private Integer serNo;
private String num;
private String equipType;
private String equipTypeName;
@ -41,7 +41,7 @@ public class EquipVO {
/**
* @return the serNo
*/
public String getSerNo() {
public Integer getSerNo() {
return serNo;
}
@ -90,7 +90,7 @@ public class EquipVO {
/**
* @param serNo the serNo to set
*/
public void setSerNo(String serNo) {
public void setSerNo(Integer serNo) {
this.serNo = serNo;
}
/**

18
src/main/java/kcg/faics/equip/web/EquipmentController.java
View File

@ -596,24 +596,24 @@ public class EquipmentController {
// 파일 저장 및 데이터 입력
String[] deleteFiles = multiRequest.getParameterValues("deleteFile");
final Map<String, MultipartFile> fileMap = multiRequest.getFileMap();
if( equipVO.getSerNo().equals("") || equipVO.getSerNo().equals(null)){
if(equipVO.getSerNo()==null || equipVO.getSerNo() == 0){
/* 등록 처리 */
equipVO.setWriter(loginUserVO.getUserid());
equipVO.print();
/* 외사장비 등록 */
result = equipmentService.insertEquipment(equipVO, fileMap);
}else{
/* 수정 처리 */
result = equipmentService.updateEquipment(equipVO, fileMap, deleteFiles);
}
equipVO.print();
equipVO.print();

163
src/main/resources/sqlmapper/mappers/fa/equip.xml
View File

@ -2,10 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="Equip">
<resultMap id="resultMap" type="hashmap">
<result property="EU_DETAIL" column="EU_DETAIL" jdbcType="CLOB" javaType="java.lang.String" />
</resultMap>
<resultMap id="useStateResult" type="useStateVO">
<result property="police" column="EU_POLICE" />
<result property="policeStr" column="EU_POLICE_NM" />
@ -175,27 +171,23 @@
]]>
</select>
<select id="Equip.getEquipUseStateInfo" parameterType="equipSearchVO" resultMap="resultMap">
<select id="Equip.getEquipUseStateInfo" parameterType="equipSearchVO" resultType="hashmap">
<![CDATA[
SELECT
B.CODENM, B.CODE2, A.*
FROM
(
SELECT *
FROM H3_EQUIP_USE_STATE
WHERE EU_YEAR = (#{year}||'')
AND EU_QUATER = (#{quater}||'')
AND EU_POLICE = #{police}
) A
RIGHT JOIN
(
SELECT CODE2, CODENM
FROM TCODE
WHERE CODE1 = 'EQUI'
AND CODE_USE_YN = 'Y'
ORDER BY CODE2
) B
ON A.EU_CODE = B.CODE2
SELECT B.CODENM,
B.CODE2,
A.*
FROM (SELECT *
FROM H3_EQUIP_USE_STATE
WHERE EU_YEAR = (#{year}||'')
AND EU_QUATER = (#{quater}||'')
AND EU_POLICE = #{police}) A
RIGHT JOIN
(SELECT CODE2, CODENM
FROM TCODE
WHERE CODE1 = 'EQUI'
AND CODE_USE_YN = 'Y'
ORDER BY CODE2 ) B
ON A.EU_CODE = B.CODE2
ORDER BY B.CODE2
]]>
</select>
@ -223,14 +215,15 @@
</insert>
<update id="Equip.updateEquipUseState" parameterType="hashmap">
UPDATE
H3_EQUIP_USE_STATE
SET
EU_CNT = #{cnt}, EU_DETAIL = #{detail},
EU_STATE = #{state}, EU_CHECK = #{check}
WHERE
EU_POLICE = #{police} AND EU_YEAR = #{year} AND
EU_QUATER = #{quater} AND EU_CODE = #{code}
UPDATE H3_EQUIP_USE_STATE
SET EU_CNT = #{cnt},
EU_DETAIL = #{detail},
EU_STATE = #{state},
EU_CHECK = #{check}
WHERE EU_POLICE = #{police}
AND EU_YEAR = (#{year}||'')
AND EU_QUATER = (#{quater}||'')
AND EU_CODE = #{code}
</update>
<!-- 사용실적 결재 -->
@ -334,60 +327,58 @@
</select>
<insert id="Equip.insertEquipment" parameterType="equipVO">
<![CDATA[
INSERT INTO TEQUIPMENT
( SERNO,
NUM,
POLICE,
EQUIPGUBUN,
EQUIPNAME,
BYEAR,BMON,
BDAY,USETERM,
STANDARD,
PURPOSE,
BPLACE,
PRICE,
MADEIN,
SERIALNO,
OPERATE,
USESECTION,
BIGO,
FILENAME1,
FILENAME2,
FILENAME3,
CREADATE,
WRITER,
LOGDATE)
values (
TEQUIPMENT_SERNO_SEQ.NEXTVAL,
(CASE WHEN (SELECT MAX(NUM) FROM TEQUIPMENT WHERE POLICE = #{police}) IS NULL THEN 1
ELSE (SELECT MAX(NUM) + 1 FROM TEQUIPMENT WHERE POLICE = #{police}) END),
#{police},
#{equipType},
#{equipName},
#{buyYear},
#{buyMonth},
#{buyDay},
#{useTerm},
#{standard},
#{purpose},
#{buyPlace},
#{price},
#{madeIn},
#{serialNo},
#{operate},
#{useSection},
#{bigo},
#{fileName1},
#{fileName2},
#{fileName3},
TO_CHAR(NOW(), 'YYYYMMDDHH24MISS'),
#{writer},
NULL
)
]]>
<selectKey resultType="String" keyProperty="serNo" order="AFTER">
SELECT TEQUIPMENT_SERNO_SEQ.CURRVAL FROM DUAL
INSERT INTO TEQUIPMENT(
NUM,
POLICE,
EQUIPGUBUN,
EQUIPNAME,
BYEAR,BMON,
BDAY,USETERM,
STANDARD,
PURPOSE,
BPLACE,
PRICE,
MADEIN,
SERIALNO,
OPERATE,
USESECTION,
BIGO,
FILENAME1,
FILENAME2,
FILENAME3,
CREADATE,
WRITER,
LOGDATE)
values (
(CASE
WHEN (SELECT MAX(NUM) FROM TEQUIPMENT WHERE POLICE = #{police}) IS NULL THEN 1
ELSE (SELECT MAX(NUM) + 1 FROM TEQUIPMENT WHERE POLICE = #{police})
END),
#{police},
#{equipType},
#{equipName},
#{buyYear},
#{buyMonth},
#{buyDay},
#{useTerm},
#{standard},
#{purpose},
#{buyPlace},
#{price},
#{madeIn},
#{serialNo},
#{operate},
#{useSection},
#{bigo},
#{fileName1},
#{fileName2},
#{fileName3},
TO_CHAR(NOW(), 'YYYYMMDDHH24MISS'),
#{writer},
NULL
)
<selectKey resultType="int" keyProperty="serNo" order="AFTER">
SELECT currval('tequip_seq') as seq
</selectKey>
</insert>